Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #70 from sernst/v1-0-3-enhancements
Browse files Browse the repository at this point in the history
Enhancements
  • Loading branch information
sernst committed Feb 24, 2020
2 parents 783b73c + 1e7f91c commit c5feed9
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 27 deletions.
10 changes: 8 additions & 2 deletions cauldron-app/src/components/Notebook/Notebook.vue
Expand Up @@ -7,10 +7,11 @@
import notebook from '../../notebook';
import emitter from '../../emitter';
import http from '../../http';
import utils from '../../utils';
function showIframe() {
const { project, view } = this.$store.getters;
return (this.viewer ? view : project) !== null;
return this.isMounted && (this.viewer ? view : project) !== null;
}
/**
Expand All @@ -37,6 +38,7 @@ function watchSelectedStep(newStepName, oldStepName) {
function data() {
return {
isLoading: true,
isMounted: false,
};
}
Expand Down Expand Up @@ -87,7 +89,11 @@ function mounted() {
// Don't return this promise because we don't want the resolution process to be
// blocking.
this.onLoaded()
utils.thenWait(1000)
.then(() => {
this.isMounted = true;
})
.then(() => this.onLoaded())
.then(() => {
emitter.$on('refresh-notebook', this.refresh);
})
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions cauldron/resources/app/assets/js/create~project.1f76fa3c.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

0 comments on commit c5feed9

Please sign in to comment.