11/**
2- * @license AngularJS v1.5.3
2+ * @license AngularJS v1.5.5
33 * (c) 2010-2016 Google, Inc. http://angularjs.org
44 * License: MIT
55 */
6- ( function ( window , angular , undefined ) { 'use strict' ;
6+ ( function ( window , angular ) { 'use strict' ;
77
88/* jshint ignore:start */
99var noop = angular . noop ;
@@ -2317,7 +2317,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
23172317 }
23182318
23192319 // IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
2320- var contains = Node . prototype . contains || function ( arg ) {
2320+ var contains = window . Node . prototype . contains || function ( arg ) {
23212321 // jshint bitwise: false
23222322 return this === arg || ! ! ( this . compareDocumentPosition ( arg ) & 16 ) ;
23232323 // jshint bitwise: true
@@ -2342,6 +2342,23 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
23422342 return matches ;
23432343 }
23442344
2345+ function filterFromRegistry ( list , matchContainer , matchCallback ) {
2346+ var containerNode = extractElementNode ( matchContainer ) ;
2347+ return list . filter ( function ( entry ) {
2348+ var isMatch = entry . node === containerNode &&
2349+ ( ! matchCallback || entry . callback === matchCallback ) ;
2350+ return ! isMatch ;
2351+ } ) ;
2352+ }
2353+
2354+ function cleanupEventListeners ( phase , element ) {
2355+ if ( phase === 'close' && ! element [ 0 ] . parentNode ) {
2356+ // If the element is not attached to a parentNode, it has been removed by
2357+ // the domOperation, and we can safely remove the event callbacks
2358+ $animate . off ( element ) ;
2359+ }
2360+ }
2361+
23452362 var $animate = {
23462363 on : function ( event , container , callback ) {
23472364 var node = extractElementNode ( container ) ;
@@ -2353,26 +2370,33 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
23532370
23542371 // Remove the callback when the element is removed from the DOM
23552372 jqLite ( container ) . on ( '$destroy' , function ( ) {
2356- $animate . off ( event , container , callback ) ;
2373+ var animationDetails = activeAnimationsLookup . get ( node ) ;
2374+
2375+ if ( ! animationDetails ) {
2376+ // If there's an animation ongoing, the callback calling code will remove
2377+ // the event listeners. If we'd remove here, the callbacks would be removed
2378+ // before the animation ends
2379+ $animate . off ( event , container , callback ) ;
2380+ }
23572381 } ) ;
23582382 } ,
23592383
23602384 off : function ( event , container , callback ) {
2385+ if ( arguments . length === 1 && ! angular . isString ( arguments [ 0 ] ) ) {
2386+ container = arguments [ 0 ] ;
2387+ for ( var eventType in callbackRegistry ) {
2388+ callbackRegistry [ eventType ] = filterFromRegistry ( callbackRegistry [ eventType ] , container ) ;
2389+ }
2390+
2391+ return ;
2392+ }
2393+
23612394 var entries = callbackRegistry [ event ] ;
23622395 if ( ! entries ) return ;
23632396
23642397 callbackRegistry [ event ] = arguments . length === 1
23652398 ? null
23662399 : filterFromRegistry ( entries , container , callback ) ;
2367-
2368- function filterFromRegistry ( list , matchContainer , matchCallback ) {
2369- var containerNode = extractElementNode ( matchContainer ) ;
2370- return list . filter ( function ( entry ) {
2371- var isMatch = entry . node === containerNode &&
2372- ( ! matchCallback || entry . callback === matchCallback ) ;
2373- return ! isMatch ;
2374- } ) ;
2375- }
23762400 } ,
23772401
23782402 pin : function ( element , parentElement ) {
@@ -2486,12 +2510,14 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
24862510
24872511 var isStructural = [ 'enter' , 'move' , 'leave' ] . indexOf ( event ) >= 0 ;
24882512
2513+ var documentHidden = $document [ 0 ] . hidden ;
2514+
24892515 // this is a hard disable of all animations for the application or on
24902516 // the element itself, therefore there is no need to continue further
24912517 // past this point if not enabled
24922518 // Animations are also disabled if the document is currently hidden (page is not visible
24932519 // to the user), because browsers slow down or do not flush calls to requestAnimationFrame
2494- var skipAnimations = ! animationsEnabled || $document [ 0 ] . hidden || disabledElementsLookup . get ( node ) ;
2520+ var skipAnimations = ! animationsEnabled || documentHidden || disabledElementsLookup . get ( node ) ;
24952521 var existingAnimation = ( ! skipAnimations && activeAnimationsLookup . get ( node ) ) || { } ;
24962522 var hasExistingAnimation = ! ! existingAnimation . state ;
24972523
@@ -2502,7 +2528,10 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
25022528 }
25032529
25042530 if ( skipAnimations ) {
2531+ // Callbacks should fire even if the document is hidden (regression fix for issue #14120)
2532+ if ( documentHidden ) notifyProgress ( runner , event , 'start' ) ;
25052533 close ( ) ;
2534+ if ( documentHidden ) notifyProgress ( runner , event , 'close' ) ;
25062535 return runner ;
25072536 }
25082537
@@ -2652,6 +2681,11 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
26522681 markElementAnimationState ( element , RUNNING_STATE ) ;
26532682 var realRunner = $$animation ( element , event , animationDetails . options ) ;
26542683
2684+ // this will update the runner's flow-control events based on
2685+ // the `realRunner` object.
2686+ runner . setHost ( realRunner ) ;
2687+ notifyProgress ( runner , event , 'start' , { } ) ;
2688+
26552689 realRunner . done ( function ( status ) {
26562690 close ( ! status ) ;
26572691 var animationDetails = activeAnimationsLookup . get ( node ) ;
@@ -2660,11 +2694,6 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
26602694 }
26612695 notifyProgress ( runner , event , 'close' , { } ) ;
26622696 } ) ;
2663-
2664- // this will update the runner's flow-control events based on
2665- // the `realRunner` object.
2666- runner . setHost ( realRunner ) ;
2667- notifyProgress ( runner , event , 'start' , { } ) ;
26682697 } ) ;
26692698
26702699 return runner ;
@@ -2681,7 +2710,10 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
26812710 forEach ( callbacks , function ( callback ) {
26822711 callback ( element , phase , data ) ;
26832712 } ) ;
2713+ cleanupEventListeners ( phase , element ) ;
26842714 } ) ;
2715+ } else {
2716+ cleanupEventListeners ( phase , element ) ;
26852717 }
26862718 } ) ;
26872719 runner . progress ( event , phase , data ) ;
@@ -3486,7 +3518,7 @@ var ngAnimateSwapDirective = ['$animate', '$rootScope', function($animate, $root
34863518 * <div ng-show="bool" class="fade">
34873519 * Show and hide me
34883520 * </div>
3489- * <button ng-click="bool=true ">Toggle</button>
3521+ * <button ng-click="bool=!bool ">Toggle</button>
34903522 *
34913523 * <style>
34923524 * .fade.ng-hide {
0 commit comments