Fix initial load error
This commit is contained in:
@ -1,6 +1,6 @@
|
|||||||
window.common = (function(global) {
|
window.common = (function(global) {
|
||||||
const {
|
const {
|
||||||
Rx: { Observable },
|
Rx: { BehaviorSubject, Observable },
|
||||||
common = { init: [] }
|
common = { init: [] }
|
||||||
} = global;
|
} = global;
|
||||||
|
|
||||||
@ -27,6 +27,11 @@ window.common = (function(global) {
|
|||||||
const iFrameScript$ =
|
const iFrameScript$ =
|
||||||
common.getScriptContent$('/js/iFrameScripts.js').shareReplay();
|
common.getScriptContent$('/js/iFrameScripts.js').shareReplay();
|
||||||
|
|
||||||
|
// behavior subject allways remembers the last value
|
||||||
|
// we use this to determine if runPreviewTest$ is defined
|
||||||
|
// and prime it with false
|
||||||
|
common.previewReady$ = new BehaviorSubject(false);
|
||||||
|
|
||||||
// runPreviewTests$ should be set up in the preview window
|
// runPreviewTests$ should be set up in the preview window
|
||||||
common.runPreviewTests$ =
|
common.runPreviewTests$ =
|
||||||
() => Observable.throw({ err: new Error('run preview not enabled') });
|
() => Observable.throw({ err: new Error('run preview not enabled') });
|
||||||
@ -42,13 +47,16 @@ window.common = (function(global) {
|
|||||||
return iFrameScript$
|
return iFrameScript$
|
||||||
.map(script => `<script>${script}</script>`)
|
.map(script => `<script>${script}</script>`)
|
||||||
.flatMap(script => {
|
.flatMap(script => {
|
||||||
|
// we make sure to override the last value in the
|
||||||
|
// subject to false here.
|
||||||
|
common.previewReady$.onNext(false);
|
||||||
preview.open();
|
preview.open();
|
||||||
preview.write(libraryIncludes + code + '<!-- -->' + script);
|
preview.write(libraryIncludes + code + '<!-- -->' + script);
|
||||||
preview.close();
|
preview.close();
|
||||||
return Observable.fromCallback($(preview).ready, $(preview))()
|
// now we filter false values and wait for the first true
|
||||||
.first()
|
return common.previewReady$
|
||||||
// delay is need here for first initial run
|
.filter(ready => ready)
|
||||||
.delay(100);
|
.first();
|
||||||
})
|
})
|
||||||
.map(() => code);
|
.map(() => code);
|
||||||
};
|
};
|
||||||
|
@ -35,4 +35,9 @@ window.__$(function() {
|
|||||||
.map(tests => ({ ...rest, tests }));
|
.map(tests => ({ ...rest, tests }));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// now that the runPreviewTest$ is defined
|
||||||
|
// we set the subject to true
|
||||||
|
// this will let the updatePreview
|
||||||
|
// script now that we are ready.
|
||||||
|
common.previewReady$.onNext(true);
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user