Merge pull request #4002 from BookStackApp/color_upgrades

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

diff --git a/resources/js/components/code-editor.js b/resources/js/components/code-editor.js
index 2d8031205f4d3fa600fef01f27f0be5f4e2dbb3d..205cbd8fdbc21efec49301430a7eee97fa67a991 100644 (file)
--- a/resources/js/components/code-editor.js
+++ b/resources/js/components/code-editor.js
@@ -1,10 +1,8 @@
 import {onChildEvent, onEnterPress, onSelect} from "../services/dom";
 import {onChildEvent, onEnterPress, onSelect} from "../services/dom";

+import {Component} from "./component";

 
 

-/**
- * Code Editor
- * @extends {Component}
- */
-class CodeEditor {
+
+export class CodeEditor extends Component {

 
     setup() {
         this.container = this.$refs.container;
 
     setup() {
         this.container = this.$refs.container;


@@ -73,7 +71,7 @@ class CodeEditor {
             isFavorite ? this.favourites.add(language) : this.favourites.delete(language);
             button.setAttribute('data-favourite', isFavorite ? 'true' : 'false');
 
             isFavorite ? this.favourites.add(language) : this.favourites.delete(language);
             button.setAttribute('data-favourite', isFavorite ? 'true' : 'false');
 

-            window.$http.patch('/settings/users/update-code-language-favourite', {
+            window.$http.patch('/preferences/update-code-language-favourite', {

                 language: language,
                 active: isFavorite
             });
                 language: language,
                 active: isFavorite
             });


@@ -128,7 +126,7 @@ class CodeEditor {
         }
 
         this.loadHistory();
         }
 
         this.loadHistory();

-        this.popup.components.popup.show(() => {
+        this.getPopup().show(() => {

             Code.updateLayout(this.editor);
             this.editor.focus();
         }, () => {
             Code.updateLayout(this.editor);
             this.editor.focus();
         }, () => {


@@ -137,10 +135,17 @@ class CodeEditor {
     }
 
     hide() {
     }
 
     hide() {

-        this.popup.components.popup.hide();
+        this.getPopup().hide();

         this.addHistory();
     }
 
         this.addHistory();
     }
 

+    /**
+     * @returns {Popup}
+     */
+    getPopup() {
+        return window.$components.firstOnElement(this.popup, 'popup');
+    }
+

     async updateEditorMode(language) {
         const Code = await window.importVersioned('code');
         Code.setMode(this.editor, language, this.editor.getValue());
     async updateEditorMode(language) {
         const Code = await window.importVersioned('code');
         Code.setMode(this.editor, language, this.editor.getValue());


@@ -184,6 +189,4 @@ class CodeEditor {
         window.sessionStorage.setItem(this.historyKey, historyString);
     }
 
         window.sessionStorage.setItem(this.historyKey, historyString);
     }
 

-}
-
-export default CodeEditor;
\ No newline at end of file
+}
\ No newline at end of file