diff --git a/ghost/admin/app/controllers/launch.js b/ghost/admin/app/controllers/launch.js index 24a4bdad8e..8aafda2692 100644 --- a/ghost/admin/app/controllers/launch.js +++ b/ghost/admin/app/controllers/launch.js @@ -7,7 +7,6 @@ export default class LaunchController extends Controller { @service config; @service router; @service settings; - @service ui; queryParams = ['step']; @@ -100,15 +99,9 @@ export default class LaunchController extends Controller { this.router.transitionTo('dashboard'); } - @action - setup() { - this.ui.set('showTour', false); - } - @action reset() { this.step = 'customise-design'; this.skippedSteps = []; - this.ui.set('showTour', true); } } diff --git a/ghost/admin/app/routes/launch.js b/ghost/admin/app/routes/launch.js index d2802cc24b..fa936734b8 100644 --- a/ghost/admin/app/routes/launch.js +++ b/ghost/admin/app/routes/launch.js @@ -3,6 +3,17 @@ import {inject as service} from '@ember/service'; export default class LaunchRoute extends AuthenticatedRoute { @service session; + @service ui; + + activate() { + // disable before rendering template to avoid issues with liquid-wormhole + // attempting to destroy elements mid-render if disabled via component hooks + this.ui.set('showTour', false); + } + + deactivate() { + this.ui.set('showTour', true); + } beforeModel() { super.beforeModel(...arguments); diff --git a/ghost/admin/app/templates/launch.hbs b/ghost/admin/app/templates/launch.hbs index 1de15a8aaf..fc67d0e041 100644 --- a/ghost/admin/app/templates/launch.hbs +++ b/ghost/admin/app/templates/launch.hbs @@ -1,4 +1,4 @@ -