diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/animator.js | 15 | ||||
| -rw-r--r-- | src/ng/directive/ngView.js | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/ng/animator.js b/src/ng/animator.js index 536c93c1..d79822f7 100644 --- a/src/ng/animator.js +++ b/src/ng/animator.js @@ -272,14 +272,17 @@ var $AnimatorProvider = function() { var durationKey = 'Duration'; var duration = 0; + //we want all the styles defined before and after forEach(element, function(element) { - var globalStyles = $window.getComputedStyle(element) || {}; - duration = Math.max( - parseFloat(globalStyles[w3cTransitionProp + durationKey]) || - parseFloat(globalStyles[vendorTransitionProp + durationKey]) || - 0, - duration); + if (element.nodeType == 1) { + var globalStyles = $window.getComputedStyle(element) || {}; + duration = Math.max( + parseFloat(globalStyles[w3cTransitionProp + durationKey]) || + parseFloat(globalStyles[vendorTransitionProp + durationKey]) || + 0, + duration); + } }); $window.setTimeout(done, duration * 1000); } else { diff --git a/src/ng/directive/ngView.js b/src/ng/directive/ngView.js index d5ef2c71..b553544c 100644 --- a/src/ng/directive/ngView.js +++ b/src/ng/directive/ngView.js @@ -194,9 +194,10 @@ var ngViewDirective = ['$http', '$templateCache', '$route', '$anchorScroll', '$c if (template) { clearContent(); - animate.enter(jqLite('<div></div>').html(template).contents(), element); + var enterElements = jqLite('<div></div>').html(template).contents(); + animate.enter(enterElements, element); - var link = $compile(element.contents()), + var link = $compile(enterElements), current = $route.current, controller; |