This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor($animate): queue all successive animations to use only one r…
…eflow
- Loading branch information
Showing
2 changed files
with
98 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -569,7 +569,7 @@ angular.module('ngAnimate', ['ng']) | |
} | ||
}]); | ||
|
||
$animateProvider.register('', ['$window', '$sniffer', function($window, $sniffer) { | ||
$animateProvider.register('', ['$window', '$sniffer', '$timeout', function($window, $sniffer, $timeout) { | ||
var forEach = angular.forEach; | ||
|
||
// Detect proper transitionend/animationend event names. | ||
|
@@ -605,6 +605,19 @@ angular.module('ngAnimate', ['ng']) | |
animationIterationCountKey = 'IterationCount', | ||
ELEMENT_NODE = 1; | ||
|
||
var animationReflowQueue = [], animationTimer, timeOut = false; | ||
function afterReflow(callback) { | ||
animationReflowQueue.push(callback); | ||
$timeout.cancel(animationTimer); | ||
animationTimer = $timeout(function() { | ||
angular.forEach(animationReflowQueue, function(fn) { | ||
fn(); | ||
}); | ||
animationReflowQueue = []; | ||
animationTimer = null; | ||
}, 10, false); | ||
} | ||
|
||
function animate(element, className, done) { | ||
if(['ng-enter','ng-leave','ng-move'].indexOf(className) == -1) { | ||
var existingDuration = 0; | ||
|
@@ -670,13 +683,15 @@ angular.module('ngAnimate', ['ng']) | |
}); | ||
|
||
// This triggers a reflow which allows for the transition animation to kick in. | ||
element.prop('clientWidth'); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
matsko
Author
Contributor
|
||
if(transitionDuration > 0) { | ||
node.style[transitionProp + propertyKey] = ''; | ||
} | ||
element.addClass(activeClassName); | ||
|
||
var css3AnimationEvents = animationendEvent + ' ' + transitionendEvent; | ||
|
||
afterReflow(function() { | ||
if(transitionDuration > 0) { | ||
node.style[transitionProp + propertyKey] = ''; | ||
} | ||
element.addClass(activeClassName); | ||
}); | ||
|
||
element.on(css3AnimationEvents, onAnimationProgress); | ||
|
||
// This will automatically be called by $animate so | ||
|
Oops, something went wrong.
I noticed this was ditched with the queuing of animations. I just wonder, wouldn't it be more reliable to still use element.prop('clientWidth') even with the queue?