aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-08-10 13:53:18 -0700
committerMisko Hevery2010-08-10 13:53:18 -0700
commit49ffab3318e3ac8cebe34d4d55a04c9fe12d62c3 (patch)
treecc90d2c4cf4b70ee1a640e49ed2edb0852fa6fdf
parent8d635cfb876e844302f24b8d08744cf44d5e7070 (diff)
parentc4c96c5c69846fb8eccc278c1eb20f94d69a2b99 (diff)
downloadangular.js-49ffab3318e3ac8cebe34d4d55a04c9fe12d62c3.tar.bz2
Merge branch 'master' of http://github.com/shyamseshadri/angular.js into shyam
-rw-r--r--src/scenario/DSL.js10
-rw-r--r--test/scenario/DSLSpec.js4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index d57a61df..96447aaf 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -56,12 +56,12 @@ angular.scenario.dsl.repeater = function(selector) {
var self = this;
var doCollect = bind(this, function() {
var repeaterArray = [];
- this.testDocument.find(selector).each(function(index) {
+ this.testDocument.find(selector).each(function() {
var element = angular.extend(self.jQuery(this),
{bindings: [],
boundTo: function(name) { return this.bindings[name]; }}
);
- element.find('*').each(function(index) {
+ element.find('*').each(function() {
var bindName = self.jQuery(this).attr('ng:bind');
if (bindName) {
element.bindings[bindName] = self.jQuery(this).text();
@@ -85,10 +85,10 @@ angular.scenario.dsl.element = function(selector) {
bindings: [],
boundTo: function(name) { return this.bindings[name]; }
});
- element.find('*').each(function(index) {
- var bindName = self.jQuery(this).attr('ng:bind');
+ element.find('*').each(function() {
+ var bindName = self.jQuery(elem).attr('ng:bind');
if (bindName) {
- element.bindings[bindName] = self.jQuery(this).text();
+ element.bindings[bindName] = self.jQuery(elem).text();
}
});
done(element);
diff --git a/test/scenario/DSLSpec.js b/test/scenario/DSLSpec.js
index 374f49c8..62de9d6c 100644
--- a/test/scenario/DSLSpec.js
+++ b/test/scenario/DSLSpec.js
@@ -85,14 +85,14 @@ describe("DSL", function() {
var html;
beforeEach(function() {
html = '<div class="container">' +
- '<table class="reports-detail">' +
+ '<div class="reports-detail">' +
'<span class="desc">Description : ' +
'<span ng:bind="report.description">Details...</span>' +
'</span>' +
'<span>Date created: ' +
'<span ng:bind="report.creationDate">01/01/01</span>' +
'</span>' +
- '</table>' +
+ '</div>' +
'</div>';
});
it('should find elements on the page and provide jquery api', function() {