neo.mjs 5.5.12 → 5.6.0

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.5.12'
+         * @member {String} version='5.6.0'
          */
-        version: '5.5.12'
+        version: '5.6.0'
     }
 
     /**

package/apps/form/view/pages/Page13.mjs

@@ -1,5 +1,5 @@
 import FormPageContainer from '../FormPageContainer.mjs';
-import TextField         from '../../../../src/form/field/Text.mjs';
+import UrlField          from '../../../../src/form/field/Url.mjs';
 
 /**
  * @class Form.view.pages.Page13
@@ -16,13 +16,15 @@ class Page13 extends FormPageContainer {
          * @member {Object[]} items
          */
         items: [{
-            module   : TextField,
+            module   : UrlField,
             labelText: 'Page 13 Field 1',
-            name     : 'page13field1'
+            name     : 'page13field1',
+            value    : 'https://google.com'
         }, {
-            module   : TextField,
+            module   : UrlField,
             labelText: 'Page 13 Field 2',
-            name     : 'page13field2'
+            name     : 'page13field2',
+            value    : 'www.google.com' // missing protocol
         }]
     }
 }

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.5.12'
+         * @member {String} version='5.6.0'
          */
-        version: '5.5.12'
+        version: '5.6.0'
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.5.12",
+    "version": "5.6.0",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/resources/examples/data/formSideNav.json

@@ -18,7 +18,7 @@
         {"id": 14, "cardIndex": null, "isHeader": true,  "isValid": null, "name": "4. Optional data"},
         {"id": 15, "cardIndex":   10, "isHeader": false, "isValid": null, "name": "ZipCodeFields"},
         {"id": 16, "cardIndex":   11, "isHeader": false, "isValid": null, "name": "EmailFields"},
-        {"id": 17, "cardIndex":   12, "isHeader": false, "isValid": null, "name": "Page 13"},
+        {"id": 17, "cardIndex":   12, "isHeader": false, "isValid": null, "name": "UrlFields"},
         {"id": 18, "cardIndex":   13, "isHeader": false, "isValid": null, "name": "Page 14"}
     ]
 }

package/src/DefaultConfig.mjs

@@ -236,12 +236,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '5.5.12'
+     * @default '5.6.0'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '5.5.12'
+    version: '5.6.0'
 };
 
 Object.assign(DefaultConfig, {

package/src/form/field/Url.mjs

@@ -18,11 +18,82 @@ class Url extends Text {
          * @protected
          */
         ntype: 'urlfield',
+        /**
+         * @member {String} errorTextValidUrl='Not a valid URL'
+         */
+        errorTextValidUrl: 'Not a valid URL',
         /**
          * Value for the inputType_ textfield config
          * @member {String} inputType='url'
          */
-        inputType: 'url'
+        inputType: 'url',
+        /**
+         * Specify allowed protocols
+         * @member {String[]} protocols=['http:','https:']
+         */
+        protocols: ['http:', 'https:']
+    }
+
+    /**
+     * Triggered when accessing the value config
+     * The default URL ctor has some sanity checks to convert an "almost" valid URL into a real one.
+     * E.g. new URL("http:www.google.com").href => "http://www.google.com"
+     * @param {String|null} value
+     * @returns {String|null}
+     * @protected
+     */
+    beforeGetValue(value) {
+        if (value) {
+            let url;
+
+            try {
+                url = new URL(value);
+            } catch(e) {
+                return value
+            }
+
+            return url.href
+        }
+
+        return value
+    }
+
+    /**
+     * Checks for client-side field errors
+     * @param {Boolean} silent=true
+     * @returns {Boolean} Returns true in case there are no client-side errors
+     */
+    validate(silent=true) {
+        let me          = this,
+            returnValue = super.validate(silent),
+            value       = me.value;
+
+        if (returnValue) {
+            if (value && !me.verifyUrl(value)) {
+                me._error = me.errorTextValidUrl;
+                returnValue = false;
+            }
+        }
+
+        !returnValue && !me.clean && me.updateError(me._error, silent);
+
+        return returnValue
+    }
+
+    /**
+     * @param {String} value
+     * @returns {Boolean}
+     */
+    verifyUrl(value) {
+        let url;
+
+        try {
+            url = new URL(value);
+        } catch(e) {
+            return false
+        }
+
+        return this.protocols.includes(url.protocol)
     }
 }