Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-19 08:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://github.com/shyamseshadri/angular.js into shyam

Browse source
This commit is contained in:
Misko Hevery 2010-08-10 13:53:18 -07:00
commit 49ffab3318
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scenario/DSL.js
View file

@ -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);

4
test/scenario/DSLSpec.js
View file

@ -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() {