neo.mjs 5.5.6 → 5.5.7

package/apps/ServiceWorker.mjs

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

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

@@ -1,5 +1,5 @@
+import EmailField        from '../../../../src/form/field/Email.mjs';
 import FormPageContainer from '../FormPageContainer.mjs';
-import TextField         from '../../../../src/form/field/Text.mjs';
 
 /**
  * @class Form.view.pages.Page12
@@ -16,11 +16,12 @@ class Page12 extends FormPageContainer {
          * @member {Object[]} items
          */
         items: [{
-            module   : TextField,
+            module   : EmailField,
             labelText: 'Page 12 Field 1',
-            name     : 'page12field1'
+            name     : 'page12field1',
+            required : true
         }, {
-            module   : TextField,
+            module   : EmailField,
             labelText: 'Page 12 Field 2',
             name     : 'page12field2'
         }]

package/examples/ServiceWorker.mjs

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

package/package.json

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

package/resources/examples/data/formSideNav.json

@@ -17,7 +17,7 @@
         {"id": 13, "cardIndex":    9, "isHeader": false, "isValid": null, "name": "SelectFields"},
         {"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": "Page 12"},
+        {"id": 16, "cardIndex":   11, "isHeader": false, "isValid": null, "name": "EmailFields"},
         {"id": 17, "cardIndex":   12, "isHeader": false, "isValid": null, "name": "Page 13"},
         {"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.6'
+     * @default '5.5.7'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '5.5.6'
+    version: '5.5.7'
 };
 
 Object.assign(DefaultConfig, {

package/src/form/field/Email.mjs

@@ -5,6 +5,14 @@ import Text from './Text.mjs';
  * @extends Neo.form.field.Text
  */
 class Email extends Text {
+    /**
+     * See: https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
+     * @member {RegExp} emailRegex
+     * @protected
+     * @static
+     */
+    static emailRegex = /^[a-z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i
+
     static config = {
         /**
          * @member {String} className='Neo.form.field.Email'
@@ -16,11 +24,36 @@ class Email extends Text {
          * @protected
          */
         ntype: 'emailfield',
+        /**
+         * @member {String} errorTextValidEmail='Not a valid email address'
+         */
+        errorTextValidEmail: 'Not a valid email address',
         /**
          * @member {String} inputType='email'
          */
         inputType: 'email'
     }
+
+    /**
+     * 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);
+
+        if (returnValue) {
+            if (!Email.emailRegex.test(me.value)) {
+                me._error = me.errorTextValidEmail;
+                returnValue = false;
+            }
+        }
+
+        !returnValue && !me.clean && me.updateError(me._error, silent);
+
+        return returnValue
+    }
 }
 
 Neo.applyClassConfig(Email);