kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-28 21:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(scope): only evaluate constant $watch expressions once

Browse Source
This commit is contained in:
Daniel Luz
2012-11-04 19:11:24 -02:00
committed by Misko Hevery
parent 1ed638582d
commit 1d7a95df56
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ng/rootScope.js
View File

@@ -300,6 +300,14 @@ function $RootScopeProvider(){
watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);}; watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
} }
if (typeof watchExp == 'string' && get.constant) {
var originalFn = watcher.fn;
watcher.fn = function(newVal, oldVal, scope) {
originalFn.call(this, newVal, oldVal, scope);
arrayRemove(array, watcher);
};
}
if (!array) { if (!array) {
array = scope.$$watchers = []; array = scope.$$watchers = [];
} }

14
test/ng/rootScopeSpec.js
View File

@@ -99,6 +99,14 @@ describe('Scope', function() {
expect(spy).wasCalled(); expect(spy).wasCalled();
})); }));
it('should not keep constant expressions on watch queue', inject(function($rootScope) {
$rootScope.$watch('1 + 1', function() {});
expect($rootScope.$$watchers.length).toEqual(1);
$rootScope.$digest();
expect($rootScope.$$watchers.length).toEqual(0);
}));
it('should delegate exceptions', function() { it('should delegate exceptions', function() {
module(function($exceptionHandlerProvider) { module(function($exceptionHandlerProvider) {
@@ -119,10 +127,14 @@ describe('Scope', function() {
var log = ''; var log = '';
$rootScope.$watch('a', function() { log += 'a'; }); $rootScope.$watch('a', function() { log += 'a'; });
$rootScope.$watch('b', function() { log += 'b'; }); $rootScope.$watch('b', function() { log += 'b'; });
// constant expressions have slightly different handling,
// let's ensure they are kept in the same list as others
$rootScope.$watch('1', function() { log += '1'; });
$rootScope.$watch('c', function() { log += 'c'; }); $rootScope.$watch('c', function() { log += 'c'; });
$rootScope.$watch('2', function() { log += '2'; });
$rootScope.a = $rootScope.b = $rootScope.c = 1; $rootScope.a = $rootScope.b = $rootScope.c = 1;
$rootScope.$digest(); $rootScope.$digest();
expect(log).toEqual('abc'); expect(log).toEqual('ab1c2');
})); }));