aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/directive/ngController.js
diff options
context:
space:
mode:
authorAndrew Silluron-Gonzalez2013-10-16 11:35:42 -0700
committerBrian Ford2013-11-21 09:52:34 -0800
commit6288cf5ca471b0615a026fdb4db3ba242c9d8f88 (patch)
treee6521af12dabbc895b7e683e017432966ad3110f /src/ng/directive/ngController.js
parentf6ecf9a3c9090593faf5fa50586c99a56b51c776 (diff)
downloadangular.js-6288cf5ca471b0615a026fdb4db3ba242c9d8f88.tar.bz2
fix(ngController): fix issue with ngInclude on the same element
This changes the priority of ngController to 500 so that it takes precedence over ngInclude. Closes #4431, #4521
Diffstat (limited to 'src/ng/directive/ngController.js')
-rw-r--r--src/ng/directive/ngController.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ng/directive/ngController.js b/src/ng/directive/ngController.js
index 6a7b8f03..5550b77f 100644
--- a/src/ng/directive/ngController.js
+++ b/src/ng/directive/ngController.js
@@ -167,6 +167,7 @@
var ngControllerDirective = [function() {
return {
scope: true,
- controller: '@'
+ controller: '@',
+ priority: 500
};
}];