diff options
| author | Igor Minar | 2011-10-20 15:37:37 -0700 |
|---|---|---|
| committer | Igor Minar | 2011-10-20 15:51:14 -0700 |
| commit | f38010d3a2f457a53798212ef72418637dabe189 (patch) | |
| tree | 1825bd10dfbcc61f71c2f03d3cc3c90df9c987b1 /test | |
| parent | 7fc18b263dc74f52bb677e446f23e35d64948841 (diff) | |
| download | angular.js-f38010d3a2f457a53798212ef72418637dabe189.tar.bz2 | |
fix(compiler): revert 8611ebe6 - calling \$digest after linking
Change introduced by me in 8611ebe6 results in considerable inefficiencies when the compiler
and linker is used from within a widget, in which case, we call $digest unnecessary since it
will be called by the $apply which called the directive/widget in the first place.
There are only two places when the extra $digest call can be useful - when manually bootstrapping
the app or in tests. However even in tests this behavior can result in unwanted results (especially
when ng:controller is involved). So it is better to leave it for the developer to call $digest
when it is really needed.
Diffstat (limited to 'test')
| -rw-r--r-- | test/CompilerSpec.js | 4 | ||||
| -rw-r--r-- | test/markupSpec.js | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/test/CompilerSpec.js b/test/CompilerSpec.js index 2cb7d19d..860cea4a 100644 --- a/test/CompilerSpec.js +++ b/test/CompilerSpec.js @@ -110,7 +110,6 @@ describe('compiler', function() { expect(sortedHtml(scope.$element)). toEqual('<div>' + 'before<#comment></#comment>' + - '<span>x</span>' + 'after' + '</div>'); scope.value = 1; @@ -119,7 +118,6 @@ describe('compiler', function() { toEqual('<div>' + 'before<#comment></#comment>' + '<span>x</span>' + - '<span>x</span>' + 'after' + '</div>'); scope.value = 2; @@ -129,7 +127,6 @@ describe('compiler', function() { 'before<#comment></#comment>' + '<span>x</span>' + '<span>x</span>' + - '<span>x</span>' + 'after' + '</div>'); scope.value = 3; @@ -140,7 +137,6 @@ describe('compiler', function() { '<span>x</span>' + '<span>x</span>' + '<span>x</span>' + - '<span>x</span>' + 'after' + '</div>'); }); diff --git a/test/markupSpec.js b/test/markupSpec.js index a05ca44f..41255b4a 100644 --- a/test/markupSpec.js +++ b/test/markupSpec.js @@ -167,20 +167,12 @@ describe("markups", function() { }); it('should bind Text with no Bindings', function() { - forEach(['checked', 'disabled', 'multiple', 'readonly', 'selected'], function(name) { + forEach(['checked', 'disabled', 'multiple', 'readonly', 'selected', 'src', 'href'], + function(name) { compile('<div ng:' + name +'="some"></div>'); - expect(element.attr('ng:bind-attr')).toBe('{"' + name +'":"some"}'); - expect(element.attr(name)).toBe(name); + expect(sortedHtml(element)).toEqual('<div ng:bind-attr="{"' + name +'":"some"}"></div>'); dealoc(element); }); - - compile('<div ng:src="some"></div>'); - expect(sortedHtml(element)).toEqual('<div ng:bind-attr="{"src":"some"}" src="some"></div>'); - dealoc(element); - - compile('<div ng:href="some"></div>'); - expect(sortedHtml(element)).toEqual('<div href="some" ng:bind-attr="{"href":"some"}"></div>'); - dealoc(element); }); it('should Parse Text With No Bindings', function() { |
