Skip to content
Open
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions app/mixins/loading-slider.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { inject as service } from '@ember/service';
import Mixin from '@ember/object/mixin';
import { isPresent } from '@ember/utils';
import { getOwner } from '@ember/application';

export default Mixin.create({
loadingSlider: service(),
Expand All @@ -9,8 +10,11 @@ export default Mixin.create({
loading() {
let loadingSliderService = this.get('loadingSlider');
loadingSliderService.startLoading();
if (isPresent(this._router)) {
this._router.one('didTransition', function() {

let routerService = getOwner(this).lookup('service:router');
let router = routerService ? routerService._router : this._router;
if (isPresent(router)) {
router.one('didTransition', function() {
loadingSliderService.endLoading();
});
}
Expand Down