diff options
| -rw-r--r-- | src/ng/compile.js | 2 | ||||
| -rw-r--r-- | test/ng/compileSpec.js | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js index 3fa4691c..ae926923 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -899,7 +899,7 @@ function $CompileProvider($provide) { origAsyncDirective = directives.shift(), // The fact that we have to copy and patch the directive seems wrong! derivedSyncDirective = extend({}, origAsyncDirective, { - controller: null, templateUrl: null, transclude: null + controller: null, templateUrl: null, transclude: null, scope: null }); $compileNode.html(''); diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index b5e4c450..75af0181 100644 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -1048,6 +1048,39 @@ describe('$compile', function() { expect($exceptionHandler.errors).toEqual([]); }); }); + + + it('should resume delayed compilation without duplicates when in a repeater', function() { + // this is a test for a regression + // scope creation, isolate watcher setup, controller instantiation, etc should happen + // only once even if we are dealing with delayed compilation of a node due to templateUrl + // and the template node is in a repeater + + var controllerSpy = jasmine.createSpy('controller'); + + module(function($compileProvider) { + $compileProvider.directive('delayed', valueFn({ + controller: controllerSpy, + templateUrl: 'delayed.html', + scope: { + title: '@' + } + })); + }); + + inject(function($templateCache, $compile, $rootScope) { + $rootScope.coolTitle = 'boom!'; + $templateCache.put('delayed.html', '<div>{{title}}</div>'); + element = $compile( + '<div><div ng-repeat="i in [1,2]"><div delayed title="{{coolTitle + i}}"></div>|</div></div>' + )($rootScope); + + $rootScope.$apply(); + + expect(controllerSpy.callCount).toBe(2); + expect(element.text()).toBe('boom!1|boom!2|'); + }); + }); }); |