Skip to content

Commit

Permalink
Merge pull request angular-ui#1224 from MichielDeMey/master
Browse files Browse the repository at this point in the history
feat(uiView) add $viewContentAnimationEnded trigger
  • Loading branch information
nateabele committed Aug 29, 2014
2 parents 7d3f172 + 8aaa53a commit 80d8fee
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/viewDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ function $ViewDirective( $state, $injector, $uiViewScroll) {

var clone = $transclude(newScope, function(clone) {
renderer.enter(clone, $element, function onUiViewEnter() {
if(currentScope) {
currentScope.$emit('$viewContentAnimationEnded');
}

if (angular.isDefined(autoScrollExp) && !autoScrollExp || scope.$eval(autoScrollExp)) {
$uiViewScroll(clone);
}
Expand Down

0 comments on commit 80d8fee

Please sign in to comment.