neo.mjs 6.9.11 → 6.10.0

package/src/component/Video.mjs

@@ -27,16 +27,16 @@ class Video extends BaseComponent {
         baseCls: ['neo-video'],
         /**
          * Current state of the video
-         * @member {Boolean} playing=false
+         * @member {Boolean} playing_=false
          */
         playing_: false,
         /**
          * Type of the video
-         * @member {Boolean} type='video/mp4'
+         * @member {String} type='video/mp4'
          */
         type: 'video/mp4',
         /*
-         * @member {String} url=null
+         * @member {String|null} url_=null
          */
         url_: null,
         /**
@@ -70,18 +70,12 @@ class Video extends BaseComponent {
     construct(config) {
         super.construct(config);
 
-        let me           = this,
-            domListeners = me.domListeners;
+        let me = this;
 
-        domListeners.push({
-            click   : me.play,
-            delegate: '.neo-video-ghost'
-        }, {
-            click   : me.pause,
-            delegate: '.neo-video-media'
-        });
-
-        me.domListeners = domListeners;
+        me.addDomListeners(
+            {click: me.play,  delegate: '.neo-video-ghost'},
+            {click: me.pause, delegate: '.neo-video-media'}
+        )
     }
 
     /**
@@ -93,10 +87,10 @@ class Video extends BaseComponent {
      */
     beforeSetPlaying(value, oldValue) {
         if (!Neo.isBoolean(value)) {
-            return oldValue;
+            return oldValue
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -112,7 +106,7 @@ class Video extends BaseComponent {
         ghost.removeDom = value;
         media.removeDom = !value;
 
-        this.vdom = vdom;
+        this.vdom = vdom
     }
 
     /**
@@ -124,7 +118,7 @@ class Video extends BaseComponent {
      */
     afterSetUrl(value, oldValue) {
         if (!value) {
-            return;
+            return
         }
 
         const me = this;
@@ -137,21 +131,21 @@ class Video extends BaseComponent {
             type: me.type
         }];
 
-        me.vdom = vdom;
+        me.vdom = vdom
     }
 
     /**
-     * Clicked ghost
+     * Clicked media
      */
-    play() {
-        this.playing = true;
+    pause() {
+        this.playing = false
     }
 
     /**
-     * Clicked media
+     * Clicked ghost
      */
-    pause() {
-        this.playing = false;
+    play() {
+        this.playing = true
     }
 }
 

package/src/controller/Base.mjs

@@ -22,7 +22,7 @@ class Base extends CoreBase {
          */
         ntype: 'controller',
         /**
-         * @member {String} defaultRoute=undefined
+         * @member {String|null} defaultRoute=null
          */
         defaultRoute: null,
         /**
@@ -37,7 +37,7 @@ class Base extends CoreBase {
          *     '/users/{userId}/posts/{postId}': 'handlePostRoute',
          *     'default'                       : 'handleOtherRoutes'
          * }
-         * @member {Object} routes={}
+         * @member {Object} routes_={}
          */
         routes_: {}
     }
@@ -51,7 +51,7 @@ class Base extends CoreBase {
         HashHistory.on('change', this.onHashChange, this)
     }
 
-     /**
+    /**
      * Triggered after the routes config got changed
      * @param {Object} value
      * @param {Object} oldValue
@@ -83,7 +83,7 @@ class Base extends CoreBase {
     destroy(...args) {
         HashHistory.un('change', this.onHashChange, this);
 
-        super.destroy(...args);
+        super.destroy(...args)
     }
 
     /**
@@ -100,58 +100,65 @@ class Base extends CoreBase {
      * @param {Object} value
      * @param {Object} oldValue
      */
-    onHashChange(value, oldValue) {
+    async onHashChange(value, oldValue) {
         let me                = this,
+            counter           = 0,
             hasRouteBeenFound = false,
             handleRoutes      = me.handleRoutes,
             routeKeys         = Object.keys(handleRoutes),
+            routeKeysLength   = routeKeys.length,
             routes            = me.routes,
-            handler, preHandler, responsePreHandler, result, route;
+            handler, key, paramObject, preHandler, responsePreHandler, result, route;
 
-        routeKeys.forEach(key => {
+        while (routeKeysLength > 0 && counter < routeKeysLength && !hasRouteBeenFound) {
+            key                = routeKeys[counter];
             handler            = null;
             preHandler         = null;
             responsePreHandler = null;
-
-            result = value.hashString.match(handleRoutes[key]);
+            paramObject        = {};
+            result             = value.hashString.match(handleRoutes[key]);
 
             if (result) {
                 const
                     arrayParamIds    = key.match(routeParamRegex),
-                    arrayParamValues = result.splice(1, result.length - 1),
-                    paramObject      = {};
+                    arrayParamValues = result.splice(1, result.length - 1);
 
                 if (arrayParamIds && arrayParamIds.length !== arrayParamValues.length) {
-                    throw 'Number of IDs and number of Values do not match';
+                    throw 'Number of IDs and number of Values do not match'
                 }
 
                 for (let i = 0; arrayParamIds && i < arrayParamIds.length; i++) {
-                    paramObject[arrayParamIds[i].substring(1, arrayParamIds[i].length - 1)] = arrayParamValues[i];
+                    paramObject[arrayParamIds[i].substring(1, arrayParamIds[i].length - 1)] = arrayParamValues[i]
                 }
 
                 route = routes[key];
 
                 if (Neo.isString(route)) {
                     handler            = route;
-                    responsePreHandler = true;
+                    responsePreHandler = true
                 } else if (Neo.isObject(route)) {
                     handler    = route.handler;
-                    preHandler = route.preHandler;
-
-                    if (preHandler) {
-                        responsePreHandler = me[preHandler]?.call(me, paramObject, value, oldValue);
-                    } else {
-                        responsePreHandler = true;
-                    }
+                    preHandler = route.preHandler
                 }
 
-                hasRouteBeenFound = true;
+                hasRouteBeenFound = true
+            }
 
-                if (responsePreHandler) {
-                    me[handler]?.call(me, paramObject, value, oldValue)
-                }
+            counter++
+        }
+
+        // execute
+        if (hasRouteBeenFound) {
+            if (preHandler) {
+                responsePreHandler = await me[preHandler]?.call(me, paramObject, value, oldValue)
+            } else {
+                responsePreHandler = true
             }
-        });
+
+            if (responsePreHandler) {
+                await me[handler]?.call(me, paramObject, value, oldValue)
+            }
+        }
 
         if (routeKeys.length > 0 && !hasRouteBeenFound) {
             if (me.defaultRoute) {

package/src/core/Base.mjs

@@ -216,7 +216,7 @@ class Base {
 
                     if (cls[item]) {
                         // add to overwrittenMethods
-                        cls.constructor.overwrittenMethods[item] = cls[item];
+                        cls.constructor.overwrittenMethods[item] = cls[item]
                     }
                 }
             }
@@ -471,7 +471,7 @@ class Base {
             // The hasOwnProperty check is intended for configs without a trailing underscore
             // => they could already have been assigned inside an afterSet-method
             if (forceAssign || !me.hasOwnProperty(keys[0])) {
-                me[keys[0]] = me[configSymbol][keys[0]];
+                me[keys[0]] = me[configSymbol][keys[0]]
             }
 
             // there is a delete-call inside the config getter as well (Neo.mjs => autoGenerateGetSet())

package/src/data/connection/Xhr.mjs

@@ -169,7 +169,7 @@ class Xhr extends Base {
         if (!opts.url) {
             console.error('Neo.Xhr.request without a given url' + JSON.stringify(opts));
         } else {
-            if (!opts.insideNeo && location.href.includes('/node_modules/neo.mjs/') && !location.href.startsWith('https://neomjs.github.io/')) {
+            if (!opts.insideNeo && location.href.includes('/node_modules/neo.mjs/') && !location.href.startsWith('https://neomjs.com/')) {
                 if (opts.url.startsWith('./') || opts.url.startsWith('../')) {
                     opts.url = '../../' + opts.url;
                 }

package/src/form/field/TextArea.mjs

@@ -32,7 +32,7 @@ class TextArea extends Text {
          * any height of text. Bounds can be set using the `minHeight` and `maxHeight` settings.
          * @member {Boolean} autoGrow=false
          */
-        autoGrow_ : false,
+        autoGrow_: false,
         /**
          * @member {String[]} baseCls=['neo-textarea','neo-textfield']
          */
@@ -75,7 +75,7 @@ class TextArea extends Text {
     }
 
     afterSetAutoGrow(autoGrow) {
-        this.syncAutoGrowMonitor();
+        autoGrow && this.syncAutoGrowMonitor();
 
         // Restore any configured height if autoGrow turned off
         if (!autoGrow) {
@@ -176,7 +176,7 @@ class TextArea extends Text {
     }
 
     async syncAutoGrowMonitor() {
-        if (this.mounted) {
+        if (this.mounted && this.autoGrow) {
             // Delegate monitoring of sizes to the VDOM thread.
             Neo.main.DomAccess.monitorAutoGrow({
                 appName  : this.appName,