From 6288cf5ca471b0615a026fdb4db3ba242c9d8f88 Mon Sep 17 00:00:00 2001
From: Andrew Silluron-Gonzalez
Date: Wed, 16 Oct 2013 11:35:42 -0700
Subject: 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
---
 src/ng/directive/ngController.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ng/directive/ngController.js')

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
   };
 }];
-- 
cgit v1.2.3