aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2013-10-11 12:58:57 -0700
committerIgor Minar2013-10-11 17:12:24 -0700
commitb7af76b4c5aa77648cc1bfd49935b48583419023 (patch)
treeb3f28a9f275d513dfc7df15890be267e68f9b1e4
parent4357da857587d3c28790e7dc654664bec5808768 (diff)
downloadangular.js-b7af76b4c5aa77648cc1bfd49935b48583419023.tar.bz2
fix(directives): correct priority of structural directives
BREAKING CHANGE: the priority of ngRepeat, ngSwitchWhen, ngIf, ngInclude and ngView has changed. This could affect directives that explicitly specify their priority. In order to make ngRepeat, ngSwitchWhen, ngIf, ngInclude and ngView work together in all common scenarios their directives are being adjusted to achieve the following precendence: Directive | Old Priority | New Priority ============================================= ngRepeat | 1000 | 1000 --------------------------------------------- ngSwitchWhen | 500 | 800 --------------------------------------------- ngIf | 1000 | 600 --------------------------------------------- ngInclude/ngView | 1000 | 400
-rwxr-xr-xsrc/ng/directive/ngIf.js2
-rw-r--r--src/ng/directive/ngInclude.js2
-rw-r--r--src/ng/directive/ngSwitch.js4
-rw-r--r--src/ngRoute/directive/ngView.js2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/ng/directive/ngIf.js b/src/ng/directive/ngIf.js
index 005dda8e..2212e762 100755
--- a/src/ng/directive/ngIf.js
+++ b/src/ng/directive/ngIf.js
@@ -80,7 +80,7 @@
var ngIfDirective = ['$animate', function($animate) {
return {
transclude: 'element',
- priority: 1000,
+ priority: 600,
terminal: true,
restrict: 'A',
compile: function (element, attr, transclude) {
diff --git a/src/ng/directive/ngInclude.js b/src/ng/directive/ngInclude.js
index 450677e1..b2ebeda9 100644
--- a/src/ng/directive/ngInclude.js
+++ b/src/ng/directive/ngInclude.js
@@ -152,7 +152,7 @@ var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$compile'
function($http, $templateCache, $anchorScroll, $compile, $animate, $sce) {
return {
restrict: 'ECA',
- priority: 1000,
+ priority: 400,
terminal: true,
transclude: 'element',
compile: function(element, attr, transclusion) {
diff --git a/src/ng/directive/ngSwitch.js b/src/ng/directive/ngSwitch.js
index 34f571ce..8087390a 100644
--- a/src/ng/directive/ngSwitch.js
+++ b/src/ng/directive/ngSwitch.js
@@ -165,7 +165,7 @@ var ngSwitchDirective = ['$animate', function($animate) {
var ngSwitchWhenDirective = ngDirective({
transclude: 'element',
- priority: 500,
+ priority: 800,
require: '^ngSwitch',
compile: function(element, attrs, transclude) {
return function(scope, element, attr, ctrl) {
@@ -177,7 +177,7 @@ var ngSwitchWhenDirective = ngDirective({
var ngSwitchDefaultDirective = ngDirective({
transclude: 'element',
- priority: 500,
+ priority: 800,
require: '^ngSwitch',
compile: function(element, attrs, transclude) {
return function(scope, element, attr, ctrl) {
diff --git a/src/ngRoute/directive/ngView.js b/src/ngRoute/directive/ngView.js
index 27357962..b031281d 100644
--- a/src/ngRoute/directive/ngView.js
+++ b/src/ngRoute/directive/ngView.js
@@ -176,7 +176,7 @@ function ngViewFactory( $route, $anchorScroll, $compile, $controller,
return {
restrict: 'ECA',
terminal: true,
- priority: 1000,
+ priority: 400,
transclude: 'element',
compile: function(element, attr, linker) {
return function(scope, $element, attr) {