@@ -590,25 +590,26 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
590
590
parentElement = parentHost ;
591
591
}
592
592
593
- while ( parentElement && parentElement . length ) {
593
+ parentElement = getDomNode ( parentElement ) ;
594
+
595
+ while ( parentElement ) {
594
596
if ( ! rootElementDetected ) {
595
597
// angular doesn't want to attempt to animate elements outside of the application
596
598
// therefore we need to ensure that the rootElement is an ancestor of the current element
597
599
rootElementDetected = isMatchingElement ( parentElement , $rootElement ) ;
598
600
}
599
601
600
- var parentNode = parentElement [ 0 ] ;
601
- if ( parentNode . nodeType !== ELEMENT_NODE ) {
602
+ if ( parentElement . nodeType !== ELEMENT_NODE ) {
602
603
// no point in inspecting the #document element
603
604
break ;
604
605
}
605
606
606
- var details = activeAnimationsLookup . get ( parentNode ) || { } ;
607
+ var details = activeAnimationsLookup . get ( parentElement ) || { } ;
607
608
// either an enter, leave or move animation will commence
608
609
// therefore we can't allow any animations to take place
609
610
// but if a parent animation is class-based then that's ok
610
611
if ( ! parentAnimationDetected ) {
611
- var parentElementDisabled = disabledElementsLookup . get ( parentNode ) ;
612
+ var parentElementDisabled = disabledElementsLookup . get ( parentElement ) ;
612
613
613
614
if ( parentElementDisabled === true && elementDisabled !== false ) {
614
615
// disable animations if the user hasn't explicitly enabled animations on the
@@ -623,7 +624,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
623
624
}
624
625
625
626
if ( isUndefined ( animateChildren ) || animateChildren === true ) {
626
- var value = jqLite . data ( parentElement [ 0 ] , NG_ANIMATE_CHILDREN_DATA ) ;
627
+ var value = jqLite . data ( parentElement , NG_ANIMATE_CHILDREN_DATA ) ;
627
628
if ( isDefined ( value ) ) {
628
629
animateChildren = value ;
629
630
}
@@ -646,15 +647,15 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
646
647
647
648
if ( ! rootElementDetected ) {
648
649
// If no rootElement is detected, check if the parentElement is pinned to another element
649
- parentHost = jqLite . data ( parentElement [ 0 ] , NG_ANIMATE_PIN_DATA ) ;
650
+ parentHost = jqLite . data ( parentElement , NG_ANIMATE_PIN_DATA ) ;
650
651
if ( parentHost ) {
651
652
// The pin target element becomes the next parent element
652
- parentElement = parentHost ;
653
+ parentElement = getDomNode ( parentHost ) ;
653
654
continue ;
654
655
}
655
656
}
656
657
657
- parentElement = parentElement . parent ( ) ;
658
+ parentElement = parentElement . parentNode ;
658
659
}
659
660
660
661
var allowAnimation = ( ! parentAnimationDetected || animateChildren ) && elementDisabled !== true ;
0 commit comments