Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-08 23:04:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert: fix($compile): correct controller instantiation...

Browse source 
fix($compile): correct controller for async directives

This reverts commit 51d32243fe
as well as commit   9c51d50318

Changing ordering of events in stable branch is not a good idea.
This commit is contained in:
Igor Minar 2013-08-21 01:11:19 -07:00
parent 0d7f19bb62
commit 166e0d63d0
2 changed files with 3 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ng/compile.js
View file

@ -1008,10 +1008,9 @@ function $CompileProvider($provide) {
replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode); replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
} }
afterTemplateNodeLinkFn( afterTemplateNodeLinkFn(function() {
beforeTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, controller), beforeTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, controller);
scope, linkNode, $rootElement, controller }, scope, linkNode, $rootElement, controller);
);
} }
linkQueue = null; linkQueue = null;
}). }).

119
test/ng/compileSpec.js
View file

@ -2216,125 +2216,6 @@ describe('$compile', function() {
expect(asyncCtrlSpy).toHaveBeenCalledOnce(); expect(asyncCtrlSpy).toHaveBeenCalledOnce();
}); });
}); });
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 allow controller usage in pre-link directive functions with templateUrl', function () {
module(function () {
var Ctrl = function (log) {
log('instance');
};
directive('myDirective', function () {
return {
scope: true,
templateUrl: 'hello.html',
controller: Ctrl,
compile: function () {
return {
pre: function (scope, template, attr, ctrl) {},
post: function () {}
};
}
};
});
});
inject(function ($templateCache, $compile, $rootScope, log) {
$templateCache.put('hello.html', '<p>Hello</p>');
element = $compile('<div my-directive></div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('instance');
expect(element.text()).toBe('Hello');
});
});
it('should allow controller usage in pre-link directive functions with a template', function () {
module(function () {
var Ctrl = function (log) {
log('instance');
};
directive('myDirective', function () {
return {
scope: true,
template: '<p>Hello</p>',
controller: Ctrl,
compile: function () {
return {
pre: function (scope, template, attr, ctrl) {},
post: function () {}
};
}
};
});
});
inject(function ($templateCache, $compile, $rootScope, log) {
element = $compile('<div my-directive></div>')($rootScope);
$rootScope.$apply();
expect(log).toEqual('instance');
expect(element.text()).toBe('Hello');
});
});
}); });