Rolled tri-layout to page edit and book-create

[bookstack] / resources / assets / js / vues / page-editor.js

diff --git a/resources/assets/js/vues/page-editor.js b/resources/assets/js/vues/page-editor.js
index 11413131f4920339d45b12ffb96531690b43d6ab..864a3a9064912b203658959391b7ca16534c6efb 100644 (file)
--- a/resources/assets/js/vues/page-editor.js
+++ b/resources/assets/js/vues/page-editor.js
@@ -1,6 +1,4 @@
-const moment = require('moment');
-require('moment/locale/en-gb');
-moment.locale('en-gb');
+import * as Dates from "../services/dates";
 
 let autoSaveFrequency = 30;
 
@@ -34,8 +32,9 @@ function mounted() {
         this.draftText = trans('entities.pages_editing_page');
     }
 
-    // Listen to save draft events from editor
+    // Listen to save events from editor
     window.$events.listen('editor-save-draft', this.saveDraft);
+    window.$events.listen('editor-save-page', this.savePage);
 
     // Listen to content changes from the editor
     window.$events.listen('editor-html-change', html => {
@@ -95,17 +94,19 @@ let methods = {
         let url = window.baseUrl(`/ajax/page/${this.pageId}/save-draft`);
         window.$http.put(url, data).then(response => {
             draftErroring = false;
-            let updateTime = moment.utc(moment.unix(response.data.timestamp)).toDate();
-            if (!this.isNewPageDraft) this.isUpdateDraft = true;
-            this.draftNotifyChange(response.data.message + moment(updateTime).format('HH:mm'));
+            if (!this.isNewDraft) this.isUpdateDraft = true;
+            this.draftNotifyChange(`${response.data.message } ${Dates.utcTimeStampToLocalTime(response.data.timestamp)}`);
             lastSave = Date.now();
         }, errorRes => {
             if (draftErroring) return;
-            window.$events('error', trans('errors.page_draft_autosave_fail'));
+            window.$events.emit('error', trans('errors.page_draft_autosave_fail'));
             draftErroring = true;
         });
     },
 
+    savePage() {
+        this.$el.closest('form').submit();
+    },
 
     draftNotifyChange(text) {
         this.draftText = text;
@@ -144,6 +145,6 @@ let computed = {
     }
 };
 
-module.exports = {
+export default {
     mounted, data, methods, computed,
 };
\ No newline at end of file