Skip to content

Commit

Permalink
fix($compile): always instantiate controllers before pre-link fns run
Browse files Browse the repository at this point in the history
Controllers should be always instantiated after compile fn runs, but before
pre-link fn runs. This way, controllers are available to pre-link fns that
request them.

Previously this was broken for async directives (directives with templateUrl).

Closes angular#3493
Closes angular#3482
Closes angular#3514
  • Loading branch information
jankuca authored and IgorMinar committed Aug 9, 2013
1 parent 1c3a46a commit 9c51d50
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/ng/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -621,13 +621,6 @@ function $CompileProvider($provide) {

directiveName = directive.name;

if (directiveValue = directive.controller) {
controllerDirectives = controllerDirectives || {};
assertNoDuplicate("'" + directiveName + "' controller",
controllerDirectives[directiveName], directive, $compileNode);
controllerDirectives[directiveName] = directive;
}

if (directiveValue = directive.transclude) {
assertNoDuplicate('transclusion', transcludeDirective, directive, $compileNode);
transcludeDirective = directive;
Expand Down Expand Up @@ -705,6 +698,13 @@ function $CompileProvider($provide) {
}
}

if (!directive.templateUrl && directive.controller) {
controllerDirectives = controllerDirectives || {};
assertNoDuplicate("'" + directiveName + "' controller",
controllerDirectives[directiveName], directive, $compileNode);
controllerDirectives[directiveName] = directive;
}

if (directive.terminal) {
nodeLinkFn.terminal = true;
terminalPriority = Math.max(terminalPriority, directive.priority);
Expand Down Expand Up @@ -962,7 +962,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, scope: null
templateUrl: null, transclude: null, scope: null
});

$compileNode.html('');
Expand Down
64 changes: 64 additions & 0 deletions test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2305,6 +2305,70 @@ describe('$compile', function() {
expect(element.text()).toBe('parentTemplateText;childTemplateText;childContentText;babyTemplateText;')
});
});


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');
});
});
});


Expand Down

0 comments on commit 9c51d50

Please sign in to comment.