fix($compile): correct controller instantiation for async directives

This fixes regression introduced by #3514 (9c51d503) - this commit is being
reverted here and a better fix is included.

The regression caused the controller to be instantiated before the isolate scope
was initialized.

Closes #3493
Closes #3482
Closes #3537
Closes #3540
This commit is contained in:
Chirayu Krishnappa
2013-08-09 19:56:10 -07:00
parent 1c1a1bc9ed
commit 51d32243fe
2 changed files with 67 additions and 11 deletions

View File

@@ -2258,6 +2258,61 @@ describe('$compile', function() {
});
it('should instantiate the controller after the isolate scope bindings are initialized (with template)', function () {
module(function () {
var Ctrl = function ($scope, log) {
log('myFoo=' + $scope.myFoo);
};
directive('myDirective', function () {
return {
scope: {
myFoo: "="
},
template: '<p>Hello</p>',
controller: Ctrl
};
});
});
inject(function ($templateCache, $compile, $rootScope, log) {
$rootScope.foo = "bar";
element = $compile('<div my-directive my-foo="foo"></div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('myFoo=bar');
});
});
it('should instantiate the controller after the isolate scope bindings are initialized (with templateUrl)', function () {
module(function () {
var Ctrl = function ($scope, log) {
log('myFoo=' + $scope.myFoo);
};
directive('myDirective', function () {
return {
scope: {
myFoo: "="
},
templateUrl: 'hello.html',
controller: Ctrl
};
});
});
inject(function ($templateCache, $compile, $rootScope, log) {
$templateCache.put('hello.html', '<p>Hello</p>');
$rootScope.foo = "bar";
element = $compile('<div my-directive my-foo="foo"></div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('myFoo=bar');
});
});
it('should instantiate controllers in the parent->child->baby order when nested transluction, templateUrl and ' +
'replacement are in the mix', function() {
// similar to the test above, except that we have one more layer of nesting and nested transclusion