ZIP Exports: Built out initial import view

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

diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 963c21008968642314050fbf179be06dd8d48625..2160675529bd5eef9a132141af2f7f9ee853dc01 100644 (file)
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -1,7 +1,7 @@
-import * as Dates from '../services/dates';

 import {onSelect} from '../services/dom';
 import {debounce} from '../services/util';
 import {Component} from './component';
 import {onSelect} from '../services/dom';
 import {debounce} from '../services/util';
 import {Component} from './component';

+import {utcTimeStampToLocalTime} from '../services/dates.ts';

 
 export class PageEditor extends Component {
 
 
 export class PageEditor extends Component {
 


@@ -118,7 +118,7 @@ export class PageEditor extends Component {
     async saveDraft() {
         const data = {name: this.titleElem.value.trim()};
 
     async saveDraft() {
         const data = {name: this.titleElem.value.trim()};
 

-        const editorContent = this.getEditorComponent().getContent();
+        const editorContent = await this.getEditorComponent().getContent();

         Object.assign(data, editorContent);
 
         let didSave = false;
         Object.assign(data, editorContent);
 
         let didSave = false;


@@ -129,7 +129,7 @@ export class PageEditor extends Component {
                 this.deleteDraftWrap.toggleAttribute('hidden', false);
             }
 
                 this.deleteDraftWrap.toggleAttribute('hidden', false);
             }
 

-            this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
+            this.draftNotifyChange(`${resp.data.message} ${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.autoSave.last = Date.now();
             if (resp.data.warning && !this.shownWarningsCache.has(resp.data.warning)) {
                 window.$events.emit('warning', resp.data.warning);


@@ -235,10 +235,12 @@ export class PageEditor extends Component {
     }
 
     /**
     }
 
     /**

-     * @return MarkdownEditor|WysiwygEditor
+     * @return {MarkdownEditor|WysiwygEditor|WysiwygEditorTinymce}

      */
     getEditorComponent() {
      */
     getEditorComponent() {

-        return window.$components.first('markdown-editor') || window.$components.first('wysiwyg-editor');
+        return window.$components.first('markdown-editor')
+            || window.$components.first('wysiwyg-editor')
+            || window.$components.first('wysiwyg-editor-tinymce');

     }
 
 }
     }
 
 }