Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reorder the broadcast complete event after the bar & spinner animation finishes #369

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

reorder the broadcast complete event after the bar & spinner animation finishes #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/loading-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ angular.module('cfp.loadingBar', [])

this.$get = ['$injector', '$document', '$timeout', '$rootScope', function ($injector, $document, $timeout, $rootScope) {
var $animate;
var $q;
var $parentSelector = this.parentSelector,
loadingBarContainer = angular.element(this.loadingBarTemplate),
loadingBar = loadingBarContainer.find('div').eq(0),
Expand All @@ -193,6 +194,9 @@ angular.module('cfp.loadingBar', [])
if (!$animate) {
$animate = $injector.get('$animate');
}
if (!$q) {
$q = $injector.get('$q');
}

$timeout.cancel(completeTimeout);

Expand Down Expand Up @@ -294,24 +298,30 @@ angular.module('cfp.loadingBar', [])
function _completeAnimation() {
status = 0;
started = false;
$rootScope.$broadcast('cfpLoadingBar:completed');
}

function _complete() {
if (!$animate) {
$animate = $injector.get('$animate');
}
if (!$q) {
$q = $injector.get('$q');
}

_set(1);
$timeout.cancel(completeTimeout);

// Attempt to aggregate any start/complete calls within 500ms:
completeTimeout = $timeout(function() {
var promise = $animate.leave(loadingBarContainer, _completeAnimation);
if (promise && promise.then) {
promise.then(_completeAnimation);
}
$animate.leave(spinner);
$rootScope.$broadcast('cfpLoadingBar:completed');
var promiseBar = $animate.leave(loadingBarContainer);
var promiseSpinner = $animate.leave(spinner);

$q.all([promiseBar, promiseSpinner])
.then(function() {
_completeAnimation();
});

}, 500);
}

Expand Down