v1.5.3-build.4694+sha.cc1de81

angular · Mar 23, 2016 · 96c1741 · 96c1741
1 parent 0e0f9b3
commit 96c1741
Show file tree

Hide file tree

Showing 36 changed files with 119 additions and 103 deletions.
diff --git a/.../angular-1.5.3-build.4693+sha.6778453.zip → .../angular-1.5.3-build.4694+sha.cc1de81.zip b/.../angular-1.5.3-build.4693+sha.6778453.zip → .../angular-1.5.3-build.4694+sha.cc1de81.zip
diff --git a/snapshot/angular-animate.js b/snapshot/angular-animate.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -2225,6 +2225,11 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
   });
 
   rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    // cancel the animation if classes added / removed in both animation cancel each other out,
+    // but only if the current animation isn't structural
+
+    if (currentAnimation.structural) return false;
+
     var nA = newAnimation.addClass;
     var nR = newAnimation.removeClass;
     var cA = currentAnimation.addClass;

diff --git a/snapshot/angular-animate.min.js b/snapshot/angular-animate.min.js
diff --git a/snapshot/angular-animate.min.js.map b/snapshot/angular-animate.min.js.map
diff --git a/snapshot/angular-aria.js b/snapshot/angular-aria.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */

diff --git a/snapshot/angular-aria.min.js b/snapshot/angular-aria.min.js
diff --git a/snapshot/angular-cookies.js b/snapshot/angular-cookies.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */

diff --git a/snapshot/angular-cookies.min.js b/snapshot/angular-cookies.min.js
diff --git a/snapshot/angular-loader.js b/snapshot/angular-loader.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -87,7 +87,7 @@ function minErr(module, ErrorConstructor) {
       return match;
     });
 
-    message += '\nhttp://errors.angularjs.org/1.5.3-build.4693+sha.6778453/' +
+    message += '\nhttp://errors.angularjs.org/1.5.3-build.4694+sha.cc1de81/' +
       (module ? module + '/' : '') + code;
 
     for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {

diff --git a/snapshot/angular-loader.min.js b/snapshot/angular-loader.min.js
diff --git a/snapshot/angular-message-format.js b/snapshot/angular-message-format.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */

diff --git a/snapshot/angular-message-format.min.js b/snapshot/angular-message-format.min.js
diff --git a/snapshot/angular-messages.js b/snapshot/angular-messages.js
@@ -1,5 +1,5 @@
 /**
- * @license AngularJS v1.5.3-build.4693+sha.6778453
+ * @license AngularJS v1.5.3-build.4694+sha.cc1de81
  * (c) 2010-2016 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -415,6 +415,13 @@ angular.module('ngMessages', [])
 
          $scope.$watchCollection($attrs.ngMessages || $attrs['for'], ctrl.render);
 
+         // If the element is destroyed, proactively destroy all the currently visible messages
+         $element.on('$destroy', function() {
+           forEach(messages, function(item) {
+             item.message.detach();
+           });
+         });
+
          this.reRender = function() {
            if (!renderLater) {
              renderLater = true;
@@ -449,6 +456,7 @@ angular.module('ngMessages', [])
          function findPreviousMessage(parent, comment) {
            var prevNode = comment;
            var parentLookup = [];
+
            while (prevNode && prevNode !== parent) {
              var prevKey = prevNode.$$ngMessageNode;
              if (prevKey && prevKey.length) {
@@ -460,8 +468,11 @@ angular.module('ngMessages', [])
              if (prevNode.childNodes.length && parentLookup.indexOf(prevNode) == -1) {
                parentLookup.push(prevNode);
                prevNode = prevNode.childNodes[prevNode.childNodes.length - 1];
+             } else if (prevNode.previousSibling) {
+               prevNode = prevNode.previousSibling;
              } else {
-               prevNode = prevNode.previousSibling || prevNode.parentNode;
+               prevNode = prevNode.parentNode;
+               parentLookup.push(prevNode);
              }
            }
          }
@@ -674,8 +685,8 @@ function ngMessageDirectiveFactory() {
                 // when we are destroying the node later.
                 var $$attachId = currentElement.$$attachId = ngMessagesCtrl.getAttachId();
 
-                // in the event that the parent element is destroyed
-                // by any other structural directive then it's time
+                // in the event that the element or a parent element is destroyed
+                // by another structural directive then it's time
                 // to deregister the message from the controller
                 currentElement.on('$destroy', function() {
                   if (currentElement && currentElement.$$attachId === $$attachId) {

diff --git a/snapshot/angular-messages.min.js b/snapshot/angular-messages.min.js