diff options
| author | Vojta Jina | 2012-09-13 02:40:00 -0700 |
|---|---|---|
| committer | Vojta Jina | 2012-09-22 12:00:16 -0700 |
| commit | cf2c49ed7fbf56df90d3a28fe74e3c866c38aec2 (patch) | |
| tree | 97c1c20a6c59a2315aea581dd7c53eac976fe595 | |
| parent | ccd52abf5d1f8f2fecb66b1d067acd59f9b8452c (diff) | |
| download | angular.js-cf2c49ed7fbf56df90d3a28fe74e3c866c38aec2.tar.bz2 | |
fix($compile): reference local in isolate scope
This was really corner case:
Watcher needs to return changed value, to notify that model might have changed and one more $digest cycle needs to be performed.
The watcher, that takes care of reference binding into an isolate scope ("="), did not return changed value, if the change was from the isolate scope to the parent.
If any other watcher returned change, it worked fine, as this change caused re-digest.
Closes #1272
| -rw-r--r-- | src/ng/compile.js | 2 | ||||
| -rw-r--r-- | test/ng/compileSpec.js | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js index ccdd1880..3fa4691c 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -747,7 +747,7 @@ function $CompileProvider($provide) { lastValue = scope[scopeName] = parentValue; } else { // if the parent can be assigned then do so - parentSet(parentScope, lastValue = scope[scopeName]); + parentSet(parentScope, parentValue = lastValue = scope[scopeName]); } } return parentValue; diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index 3d6144ac..b5e4c450 100644 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -1709,6 +1709,7 @@ describe('$compile', function() { attrAlias: '@attr', ref: '=', refAlias: '= ref', + reference: '=', expr: '&', exprAlias: '&expr' }, @@ -1830,6 +1831,24 @@ describe('$compile', function() { $rootScope.$apply(); expect(componentScope.ref).toBe('hello misko'); })); + + // regression + it('should stabilize model', inject(function() { + compile('<div><span my-component reference="name">'); + + var lastRefValueInParent; + $rootScope.$watch('name', function(ref) { + lastRefValueInParent = ref; + }); + + $rootScope.name = 'aaa'; + $rootScope.$apply(); + + componentScope.reference = 'new'; + $rootScope.$apply(); + + expect(lastRefValueInParent).toBe('new'); + })); }); |
