Fixed loading animation delay

[bookstack] / resources / js / components / page-editor.js

diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index f66e23b19923d2814b12ea5e2da844892c563557..ce123e987b055db94769f7326a8fdf63f841342b 100644 (file)
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -24,6 +24,8 @@ class PageEditor {
         this.draftDisplayIcon = this.$refs.draftDisplayIcon;
         this.changelogInput = this.$refs.changelogInput;
         this.changelogDisplay = this.$refs.changelogDisplay;
         this.draftDisplayIcon = this.$refs.draftDisplayIcon;
         this.changelogInput = this.$refs.changelogInput;
         this.changelogDisplay = this.$refs.changelogDisplay;

+        this.changeEditorButtons = this.$manyRefs.changeEditor;
+        this.switchDialogContainer = this.$refs.switchDialog;

 
         // Translations
         this.draftText = this.$opts.draftText;
 
         // Translations
         this.draftText = this.$opts.draftText;


@@ -40,6 +42,7 @@ class PageEditor {
             frequency: 30000,
             last: 0,
         };
             frequency: 30000,
             last: 0,
         };

+        this.shownWarningsCache = new Set();

 
         if (this.pageId !== 0 && this.draftsEnabled) {
             window.setTimeout(() => {
 
         if (this.pageId !== 0 && this.draftsEnabled) {
             window.setTimeout(() => {


@@ -71,6 +74,9 @@ class PageEditor {
         // Draft Controls
         onSelect(this.saveDraftButton, this.saveDraft.bind(this));
         onSelect(this.discardDraftButton, this.discardDraft.bind(this));
         // Draft Controls
         onSelect(this.saveDraftButton, this.saveDraft.bind(this));
         onSelect(this.discardDraftButton, this.discardDraft.bind(this));

+
+        // Change editor controls
+        onSelect(this.changeEditorButtons, this.changeEditor.bind(this));

     }
 
     setInitialFocus() {
     }
 
     setInitialFocus() {


@@ -112,13 +118,21 @@ class PageEditor {
             data.markdown = this.editorMarkdown;
         }
 
             data.markdown = this.editorMarkdown;
         }
 

+        let didSave = false;

         try {
             const resp = await window.$http.put(`/ajax/page/${this.pageId}/save-draft`, data);
             if (!this.isNewDraft) {
                 this.toggleDiscardDraftVisibility(true);
             }
         try {
             const resp = await window.$http.put(`/ajax/page/${this.pageId}/save-draft`, data);
             if (!this.isNewDraft) {
                 this.toggleDiscardDraftVisibility(true);
             }

+

             this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
             this.autoSave.last = Date.now();
             this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
             this.autoSave.last = Date.now();

+            if (resp.data.warning && !this.shownWarningsCache.has(resp.data.warning)) {
+                window.$events.emit('warning', resp.data.warning);
+                this.shownWarningsCache.add(resp.data.warning);
+            }
+
+            didSave = true;

         } catch (err) {
             // Save the editor content in LocalStorage as a last resort, just in case.
             try {
         } catch (err) {
             // Save the editor content in LocalStorage as a last resort, just in case.
             try {


@@ -129,6 +143,7 @@ class PageEditor {
             window.$events.emit('error', this.autosaveFailText);
         }
 
             window.$events.emit('error', this.autosaveFailText);
         }
 

+        return didSave;

     }
 
     draftNotifyChange(text) {
     }
 
     draftNotifyChange(text) {


@@ -153,8 +168,10 @@ class PageEditor {
 
         this.draftDisplay.innerText = this.editingPageText;
         this.toggleDiscardDraftVisibility(false);
 
         this.draftDisplay.innerText = this.editingPageText;
         this.toggleDiscardDraftVisibility(false);

-        window.$events.emit('editor-html-update', response.data.html || '');
-        window.$events.emit('editor-markdown-update', response.data.markdown || response.data.html);
+        window.$events.emit('editor::replace', {
+            html: response.data.html,
+            markdown: response.data.markdown,
+        });

 
         this.titleElem.value = response.data.name;
         window.setTimeout(() => {
 
         this.titleElem.value = response.data.name;
         window.setTimeout(() => {


@@ -178,6 +195,18 @@ class PageEditor {
         this.discardDraftWrap.classList.toggle('hidden', !show);
     }
 
         this.discardDraftWrap.classList.toggle('hidden', !show);
     }
 

+    async changeEditor(event) {
+        event.preventDefault();
+
+        const link = event.target.closest('a').href;
+        const dialog = this.switchDialogContainer.components['confirm-dialog'];
+        const [saved, confirmed] = await Promise.all([this.saveDraft(), dialog.show()]);
+
+        if (saved && confirmed) {
+            window.location = link;
+        }
+    }
+

 }
 
 export default PageEditor;
\ No newline at end of file
 }
 
 export default PageEditor;
\ No newline at end of file