neo.mjs 6.41.0 → 6.43.0

package/src/main/addon/DragDrop.mjs

@@ -510,6 +510,4 @@ class DragDrop extends Base {
     }
 }
 
-Neo.setupClass(DragDrop);
-
-export default DragDrop;
+export default Neo.setupClass(DragDrop);

package/src/main/addon/GoogleMaps.mjs

@@ -272,6 +272,4 @@ class GoogleMaps extends Base {
     }
 }
 
-Neo.setupClass(GoogleMaps);
-
-export default GoogleMaps;
+export default Neo.setupClass(GoogleMaps);

package/src/main/addon/HighlightJS.mjs

@@ -17,17 +17,18 @@ class HighlightJS extends Base {
          * @member {String} highlightJsPath='./resources/highlight/highlight.pack.js'
          * @protected
          */
-        highlightJsPath: './resources/highlight/highlight.pack.js',
+        highlightJsPath: './resources/lib/highlight/highlight.pack.js',
         /**
          * @member {String} highlightJsLineNumbersPath=Neo.config.basePath + 'node_modules/highlightjs-line-numbers.js/dist/highlightjs-line-numbers.min.js'
          * @protected
          */
         highlightJsLineNumbersPath: Neo.config.basePath + 'node_modules/highlightjs-line-numbers.js/dist/highlightjs-line-numbers.min.js',
         /**
-         * @member {Boolean} libraryLoaded_=true
+         * Disabling the auto-preload to honor custom paths.
+         * @member {Boolean|Number} preloadFilesDelay=false
          * @protected
          */
-        libraryLoaded_: false,
+        preloadFilesDelay: false,
         /**
          * Remote method access for other workers
          * @member {Object} remote
@@ -36,7 +37,7 @@ class HighlightJS extends Base {
         remote: {
             app: [
                 'highlightAuto',
-                'loadLibrary',
+                'loadFiles',
                 'scrollIntoView',
                 'syntaxHighlight',
                 'switchTheme',
@@ -48,78 +49,52 @@ class HighlightJS extends Base {
          * @member {String} themePath='./resources/highlightjs-custom-github-theme.css'
          * @protected
          */
-        themePath: './resources/highlightjs-custom-github-theme.css'
-    }
-
-    /**
-     * @member {Object[]} cache=[]
-     * @protected
-     */
-    cache = []
-
-    /**
-     * Triggered after the libraryLoaded config got changed
-     * @param {Boolean} value
-     * @param {Boolean} oldValue
-     * @protected
-     */
-    afterSetLibraryLoaded(value, oldValue) {
-        if (value) {
-            let me = this,
-                returnValue;
-
-            me.cache.forEach(item => {
-                returnValue = me[item.fn](item.data);
-                item.resolve(returnValue)
-            });
-
-            me.cache = []
-        }
-    }
-
-    /**
-     * Internally caches call when the hljs namespace does not exist yet
-     * @param item
-     * @returns {Promise<unknown>}
-     */
-    cacheMethodCall(item) {
-        return new Promise((resolve, reject) => {
-            this.cache.push({...item, resolve})
-        })
+        themePath: './resources/lib/highlightjs-custom-github-theme.css'
     }
 
     /**
      * See: https://highlightjs.readthedocs.io/en/latest/api.html#highlightauto
      * @param {Object} data
      * @param {String} data.html
-     * @returns {Object} of the form {language, relevance, value, secondBest}
+     * @returns {Object} value
      */
     highlightAuto(data) {
-        if (window.hljs) {
-            return hljs.highlightAuto(data.html)
-        } else {
+        if (!this.isReady) {
             return this.cacheMethodCall({fn: 'highlightAuto', data})
         }
+
+        return hljs.highlightAuto(data.html).value
     }
 
     /**
      * @param {Object} data
      * @returns {Boolean}
      */
-    async loadLibrary(data) {
-        delete data.appName;
-
+    async loadFiles(data) {
         let me = this;
 
-        me.set(data);
+        if (me.isLoading || me.isReady) {
+            return true
+        }
+
+        me.isLoading = true;
 
-        await DomAccess.loadScript(me.highlightJsPath).then(() => {
-            DomAccess.addScript({src: me.highlightJsLineNumbersPath})
-        });
+        if (data) {
+            delete data.appName;
+            delete data.windowId;
 
-        Neo.main.addon.Stylesheet.createStyleSheet(null, 'hljs-theme', me.themePath);
+            me.set(data);
+        }
+
+        await DomAccess.loadScript(me.highlightJsPath);
 
-        this.libraryLoaded = true;
+        await Promise.all([
+            DomAccess.loadScript(me.highlightJsLineNumbersPath),
+            Neo.main.addon.Stylesheet.createStyleSheet(null, 'hljs-theme', me.themePath)
+        ]);
+
+        me.isLoading = false;
+        me.isReady   = true;
 
         return true
     }
@@ -131,6 +106,10 @@ class HighlightJS extends Base {
      * @protected
      */
     scrollIntoView(data) {
+        if (!this.isReady) {
+            return this.cacheMethodCall({fn: 'scrollIntoView', data})
+        }
+
         let parentEl = DomAccess.getElement(data.vnodeId),
             el       = parentEl.querySelector('[data-list-header="' + data.text + '"]');
 
@@ -162,28 +141,28 @@ class HighlightJS extends Base {
      * @param {String} data.vnodeId
      */
     syntaxHighlight(data) {
-        if (window.hljs) {
-            let node = document.getElementById(data.vnodeId);
-
-            if (node) {
-                hljs.highlightBlock(node);
-                hljs.lineNumbersBlock(node)
-            }
-        } else {
+        if (!this.isReady) {
             return this.cacheMethodCall({fn: 'syntaxHighlight', data})
         }
+
+        let node = document.getElementById(data.vnodeId);
+
+        if (node) {
+            hljs.highlightBlock(node);
+            hljs.lineNumbersBlock(node)
+        }
     }
 
     /**
      * @param {Object} data
      */
     syntaxHighlightInit(data) {
-        if (window.hljs) {
-            let blocks = document.querySelectorAll('pre code:not(.hljs)');
-            Array.prototype.forEach.call(blocks, hljs.highlightBlock)
-        } else {
+        if (!this.isReady) {
             return this.cacheMethodCall({fn: 'syntaxHighlightInit', data})
         }
+
+        let blocks = document.querySelectorAll('pre code:not(.hljs)');
+        Array.prototype.forEach.call(blocks, hljs.highlightBlock)
     }
 
     /**
@@ -193,7 +172,7 @@ class HighlightJS extends Base {
      * @param {Number} data.removeLine
      */
     syntaxHighlightLine(data) {
-        if (!window.hljs) {
+        if (!this.isReady) {
             return this.cacheMethodCall({fn: 'syntaxHighlightLine', data})
         }
 
@@ -222,6 +201,4 @@ class HighlightJS extends Base {
     }
 }
 
-Neo.setupClass(HighlightJS);
-
-export default HighlightJS;
+export default Neo.setupClass(HighlightJS);

package/src/main/addon/IntersectionObserver.mjs

@@ -195,6 +195,4 @@ class NeoIntersectionObserver extends Base {
     }
 }
 
-Neo.setupClass(NeoIntersectionObserver);
-
-export default NeoIntersectionObserver;
+export default Neo.setupClass(NeoIntersectionObserver);

package/src/main/addon/LocalStorage.mjs

@@ -70,6 +70,4 @@ class LocalStorage extends Base {
     }
 }
 
-Neo.setupClass(LocalStorage);
-
-export default LocalStorage;
+export default Neo.setupClass(LocalStorage);

package/src/main/addon/MapboxGL.mjs

@@ -481,6 +481,4 @@ class MapboxGL extends Base {
     }
 }
 
-Neo.setupClass(MapboxGL);
-
-export default MapboxGL;
+export default Neo.setupClass(MapboxGL);

package/src/main/addon/Markdown.mjs

@@ -53,6 +53,4 @@ class Markdown extends Base {
     }
 }
 
-Neo.setupClass(Markdown);
-
-export default Markdown;
+export default Neo.setupClass(Markdown);

package/src/main/addon/MonacoEditor.mjs

@@ -39,25 +39,12 @@ class MonacoEditor extends Base {
         }
     }
 
-    /**
-     * Will get set to true once all Monaco related files got loaded
-     * @member {Boolean} isReady=false
-     */
-    isReady = false
     /**
      * Stores component DOM ids as keys and editor instances as values
      * @member {Object} map={}
      */
     map = {}
 
-    /**
-     * @param {Object} config
-     */
-    construct(config) {
-        super.construct(config);
-        this.loadFiles()
-    }
-
     /**
      * For a complete list of options see:
      * https://microsoft.github.io/monaco-editor/typedoc/interfaces/editor.IEditorOptions.html
@@ -66,14 +53,24 @@ class MonacoEditor extends Base {
     createInstance(data) {
         let me   = this,
             {id} = data,
-            editor;
+            editor, node;
 
-        delete data.appName;
-        delete data.id;
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'createInstance', data})
+        } else {
+            delete data.appName;
+            delete data.id;
 
-        editor = me.map[id] = monaco.editor.create(DomAccess.getElement(id), data);
+            node = DomAccess.getElement(id);
 
-        editor.getModel().onDidChangeContent(me.onContentChange.bind(me, id))
+            if (node) {
+                editor = me.map[id] = monaco.editor.create(node, data);
+
+                editor.getModel().onDidChangeContent(me.onContentChange.bind(me, id))
+            } else {
+                console.warn(`addon.MonacoEditor: node ${id} not found`)
+            }
+        }
     }
 
     /**
@@ -81,8 +78,14 @@ class MonacoEditor extends Base {
      * @param {String} data.id
      */
     destroyInstance(data) {
-        // todo: destroy the editor instance if possible
-        delete this.map[data.id]
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'destroyInstance', data})
+        } else {
+            // todo: destroy the editor instance if possible
+            delete this.map[data.id]
+        }
     }
 
     /**
@@ -91,7 +94,13 @@ class MonacoEditor extends Base {
      * @returns {Object}
      */
     getValue(data) {
-        return this.map[data.id].getModel().getValue()
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'getValue', data})
+        } else {
+            return me.map[data.id].getModel().getValue()
+        }
     }
 
     /**
@@ -100,23 +109,30 @@ class MonacoEditor extends Base {
      * @param {String} data.id
      */
     layoutEditor(data) {
-        this.map[data.id].layout()
+        this.isReady && this.map[data.id].layout()
     }
 
     /**
      *
      */
     async loadFiles() {
-        let path = this.libraryBasePath;
+        let me   = this,
+            path = me.libraryBasePath;
+
+        me.isLoading = true;
 
         window.require = {paths: {vs: path}};
 
-        await DomAccess.loadStylesheet(path + '/editor/editor.main.css', {name: 'vs/editor/editor.main'});
         await DomAccess.loadScript(path + '/loader.js');
-        await DomAccess.loadScript(path + '/editor/editor.main.nls.js');
-        await DomAccess.loadScript(path + '/editor/editor.main.js');
 
-        this.isReady = true
+        await Promise.all([
+            DomAccess.loadStylesheet(path + '/editor/editor.main.css', {name: 'vs/editor/editor.main'}),
+            DomAccess.loadScript(path + '/editor/editor.main.nls.js'),
+            DomAccess.loadScript(path + '/editor/editor.main.js')
+        ]);
+
+        me.isLoading = false;
+        me.isReady   = true
     }
 
     /**
@@ -143,7 +159,13 @@ class MonacoEditor extends Base {
      * @param {String} data.value
      */
     setLanguage(data) {
-        this.map[data.id].getModel().setLanguage(data.value)
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'setLanguage', data})
+        } else {
+            me.map[data.id].getModel().setLanguage(data.value)
+        }
     }
 
     /**
@@ -152,7 +174,13 @@ class MonacoEditor extends Base {
      * @param {String} data.value
      */
     setTheme(data) {
-        this.map[data.id]._themeService.setTheme(data.value)
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'setTheme', data})
+        } else {
+            me.map[data.id]._themeService.setTheme(data.value)
+        }
     }
 
     /**
@@ -161,7 +189,13 @@ class MonacoEditor extends Base {
      * @param {String} data.value
      */
     setValue(data) {
-        this.map[data.id].getModel().setValue(data.value)
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'setValue', data})
+        } else {
+            me.map[data.id].getModel().setValue(data.value)
+        }
     }
 
     /**
@@ -170,10 +204,14 @@ class MonacoEditor extends Base {
      * @param {Object} data.options
      */
     updateOptions(data) {
-        this.map[data.id].updateOptions(data.options)
+        let me = this;
+
+        if (!me.isReady) {
+            return me.cacheMethodCall({fn: 'updateOptions', data})
+        } else {
+            me.map[data.id].updateOptions(data.options)
+        }
     }
 }
 
-Neo.setupClass(MonacoEditor);
-
-export default MonacoEditor;
+export default Neo.setupClass(MonacoEditor);

package/src/main/addon/Mwc.mjs

@@ -84,6 +84,4 @@ class Mwc extends Base {
     }
 }
 
-Neo.setupClass(Mwc);
-
-export default Mwc;
+export default Neo.setupClass(Mwc);

package/src/main/addon/Navigator.mjs

@@ -496,6 +496,4 @@ class Navigator extends Base {
     }
 }
 
-Neo.setupClass(Navigator);
-
-export default Navigator;
+export default Neo.setupClass(Navigator);

package/src/main/addon/Popover.mjs

@@ -64,6 +64,4 @@ class Popover extends Base {
     }
 }
 
-Neo.setupClass(Popover);
-
-export default Popover;
+export default Neo.setupClass(Popover);

package/src/main/addon/PrefixField.mjs

@@ -136,6 +136,4 @@ class PrefixField extends Base {
     }
 }
 
-Neo.setupClass(PrefixField);
-
-export default PrefixField;
+export default Neo.setupClass(PrefixField);

package/src/main/addon/ResizeObserver.mjs

@@ -122,6 +122,4 @@ class NeoResizeObserver extends Base {
     }
 }
 
-Neo.setupClass(NeoResizeObserver);
-
-export default NeoResizeObserver;
+export default Neo.setupClass(NeoResizeObserver);

package/src/main/addon/ServiceWorker.mjs

@@ -64,6 +64,4 @@ class ServiceWorker extends Base {
     }
 }
 
-Neo.setupClass(ServiceWorker);
-
-export default ServiceWorker;
+export default Neo.setupClass(ServiceWorker);

package/src/main/addon/Siesta.mjs

@@ -42,6 +42,4 @@ class Siesta extends Base {
     }
 }
 
-Neo.setupClass(Siesta);
-
-export default Siesta;
+export default Neo.setupClass(Siesta);

package/src/main/addon/Stylesheet.mjs

@@ -295,6 +295,4 @@ class Stylesheet extends Base {
     }
 }
 
-Neo.setupClass(Stylesheet);
-
-export default Stylesheet;
+export default Neo.setupClass(Stylesheet);

package/src/main/addon/WebComponent.mjs

@@ -45,6 +45,4 @@ class WebComponent extends Base {
     }
 }
 
-Neo.setupClass(WebComponent);
-
-export default WebComponent;
+export default Neo.setupClass(WebComponent);

package/src/main/addon/WindowPosition.mjs

@@ -291,6 +291,4 @@ class WindowPosition extends Base {
     }
 }
 
-Neo.setupClass(WindowPosition);
-
-export default WindowPosition;
+export default Neo.setupClass(WindowPosition);

package/src/main/draggable/sensor/Base.mjs

@@ -73,6 +73,4 @@ class Base extends CoreBase {
     }
 }
 
-Neo.setupClass(Base);
-
-export default Base;
+export default Neo.setupClass(Base);

package/src/main/draggable/sensor/Mouse.mjs

@@ -213,6 +213,4 @@ function preventDefault(event) {
     event.preventDefault()
 }
 
-Neo.setupClass(Mouse);
-
-export default Mouse;
+export default Neo.setupClass(Mouse);

package/src/main/draggable/sensor/Touch.mjs

@@ -241,6 +241,4 @@ function preventDefault(event) {
     event.stopPropagation()
 }
 
-Neo.setupClass(Touch);
-
-export default Touch;
+export default Neo.setupClass(Touch);

package/src/main/mixin/DeltaUpdates.mjs

@@ -343,6 +343,4 @@ class DeltaUpdates extends Base {
     }
 }
 
-Neo.setupClass(DeltaUpdates);
-
-export default DeltaUpdates;
+export default Neo.setupClass(DeltaUpdates);

package/src/main/mixin/TouchDomEvents.mjs

@@ -86,6 +86,4 @@ class TouchDomEvents extends Base {
     }
 }
 
-Neo.setupClass(TouchDomEvents);
-
-export default TouchDomEvents;
+export default Neo.setupClass(TouchDomEvents);

package/src/manager/Base.mjs

@@ -44,6 +44,4 @@ class Base extends CollectionBase{
     }
 }
 
-Neo.setupClass(Base);
-
-export default Base;
+export default Neo.setupClass(Base);

package/src/menu/List.mjs

@@ -420,6 +420,4 @@ class List extends BaseList {
     }
 }
 
-Neo.setupClass(List);
-
-export default List;
+export default Neo.setupClass(List);

package/src/menu/Model.mjs

@@ -46,6 +46,4 @@ class Model extends BaseModel {
     }
 }
 
-Neo.setupClass(Model);
-
-export default Model;
+export default Neo.setupClass(Model);

package/src/menu/Panel.mjs

@@ -87,6 +87,4 @@ class Panel extends BasePanel {
     }
 }
 
-Neo.setupClass(Panel);
-
-export default Panel;
+export default Neo.setupClass(Panel);

package/src/menu/Store.mjs

@@ -19,6 +19,4 @@ class Store extends BaseStore {
     }
 }
 
-Neo.setupClass(Store);
-
-export default Store;
+export default Neo.setupClass(Store);

package/src/model/Component.mjs

@@ -731,6 +731,4 @@ class Component extends Base {
     }
 }
 
-Neo.setupClass(Component);
-
-export default Component;
+export default Neo.setupClass(Component);

package/src/plugin/Base.mjs

@@ -50,6 +50,4 @@ class Base extends CoreBase {
     }
 }
 
-Neo.setupClass(Base);
-
-export default Base;
+export default Neo.setupClass(Base);

package/src/plugin/Popover.mjs

@@ -185,6 +185,4 @@ class Popover extends Base {
     }
 }
 
-Neo.setupClass(Popover);
-
-export default Popover;
+export default Neo.setupClass(Popover);

package/src/plugin/PrefixField.mjs

@@ -290,6 +290,4 @@ class PrefixField extends Base {
     }
 }
 
-Neo.setupClass(PrefixField);
-
-export default PrefixField;
+export default Neo.setupClass(PrefixField);

package/src/plugin/Resizable.mjs

@@ -570,6 +570,4 @@ class Resizable extends Base {
     }
 }
 
-Neo.setupClass(Resizable);
-
-export default Resizable;
+export default Neo.setupClass(Resizable);

package/src/plugin/Responsive.mjs

@@ -170,6 +170,4 @@ class Responsive extends BasePlugin {
     }
 }
 
-Neo.setupClass(Responsive);
-
-export default Responsive;
+export default Neo.setupClass(Responsive);