jsuites 5.0.18 → 5.0.21

package/dist/jsuites.js

@@ -1395,7 +1395,7 @@ function Mask() {
         // Number
         numeric: [ '0{1}(.{1}0+)?' ],
         // Data tokens
-        datetime: [ 'YYYY', 'YYY', 'YY', 'MMMMM', 'MMMM', 'MMM', 'MM', 'DDDDD', 'DDDD', 'DDD', 'DD', 'DY', 'DAY', 'WD', 'D', 'Q', 'MONTH', 'MON', 'HH24', 'HH12', 'HH', '\\[H\\]', 'H', 'AM/PM', 'PM', 'AM', 'MI', 'SS', 'MS', 'Y', 'M' ],
+        datetime: [ 'YYYY', 'YYY', 'YY', 'MMMMM', 'MMMM', 'MMM', 'MM', 'DDDDD', 'DDDD', 'DDD', 'DD', 'DY', 'DAY', 'WD', 'D', 'Q', 'MONTH', 'MON', 'HH24', 'HH12', 'HH', '\\[H\\]', 'H', 'AM/PM', 'MI', 'SS', 'MS', 'Y', 'M' ],
         // Other
         general: [ 'A', '0', '[0-9a-zA-Z\$]+', '.']
     }
@@ -1430,11 +1430,19 @@ function Mask() {
             if (this.mask.toLowerCase().indexOf('[h]') !== -1) {
                 v = parseInt(this.date[3]);
             } else {
-                v = parseInt(this.date[3]) % 24;
+                let h = parseInt(this.date[3]);
+                if (h < 13 && this.values.indexOf('PM') !== -1) {
+                    v = (h+12) % 24;
+                } else {
+                    v = h % 24;
+                }
             }
             if (this.date[4]) {
                 v += parseFloat(this.date[4] / 60);
             }
+            if (this.date[5]) {
+                v += parseFloat(this.date[5] / 3600);
+            }
             v /= 24;
         } else if (this.date[0] || this.date[1] || this.date[2] || this.date[3] || this.date[4] || this.date[5]) {
             if (this.date[0] && this.date[1] && ! this.date[2]) {
@@ -1459,12 +1467,14 @@ function Mask() {
     }
 
     var isFormula = function(value) {
-        return (''+value).chartAt(0) == '=';
+        var v = (''+value)[0];
+        return v == '=' ? true : false;
     }
 
     var isNumeric = function(t) {
         return t === 'currency' || t === 'percentage' || t === 'numeric' ? true : false;
     }
+
     /**
      * Get the decimal defined in the mask configuration
      */
@@ -1564,7 +1574,7 @@ function Mask() {
     }
 
     var FormatValue = function(v, event) {
-        if (v == '') {
+        if (v === '') {
             return '';
         }
         // Get decimal
@@ -1573,25 +1583,33 @@ function Mask() {
         var o = this.options;
         // Parse value
         v = ParseValue.call(this, v);
-        if (v == '') {
+        if (v === '') {
             return '';
         }
+        var t = null;
         // Temporary value
         if (v[0]) {
-            var t = parseFloat(v[0] + '.1');
-            if (o.style == 'percent') {
-                t /= 100;
+            if (o.style === 'percent') {
+                t = parseFloat(v[0]) / 100;
+            } else {
+                t = parseFloat(v[0] + '.1');
             }
-        } else {
-            var t = null;
         }
 
-        if ((v[0] == '-' || v[0] == '-00') && ! v[1] && (event && event.inputType == "deleteContentBackward")) {
+        if ((v[0] === '-' || v[0] === '-00') && ! v[1] && (event && event.inputType == "deleteContentBackward")) {
             return '';
         }
 
         var n = new Intl.NumberFormat(this.locale, o).format(t);
         n = n.split(d);
+
+        if (o.style === 'percent') {
+            if (n[0].indexOf('%') !== -1) {
+                n[0] = n[0].replace('%', '');
+                n[2] = '%';
+            }
+        }
+
         if (typeof(n[1]) !== 'undefined') {
             var s = n[1].replace(/[0-9]*/g, '');
             if (s) {
@@ -1615,7 +1633,6 @@ function Mask() {
         }
 
         // Get decimal
-        var d = getDecimal.call(this);
         var n = FormatValue.call(this, v, event);
         var t = (n.length) - v.length;
         var index = Caret.call(e) + t;
@@ -1665,7 +1682,7 @@ function Mask() {
             if (adjustNumeric) {
                 var p = null;
                 for (var i = 0; i < n.length; i++) {
-                    if (n[i].match(/[\-0-9]/g) || n[i] == '.' || n[i] == ',') {
+                    if (n[i].match(/[\-0-9]/g) || n[i] === '.' || n[i] === ',') {
                         p = i;
                     }
                 }
@@ -1986,7 +2003,6 @@ function Mask() {
             }
         },
         'HH24': function(v, two) {
-            var test = false;
             if (parseInt(v) >= 0 && parseInt(v) < 10) {
                 if (this.values[this.index] == null || this.values[this.index] == '') {
                     if (parseInt(v) > 2 && parseInt(v) < 10) {
@@ -2000,9 +2016,15 @@ function Mask() {
                     }
                 } else {
                     if (this.values[this.index] == 2 && parseInt(v) < 4) {
+                        if (! two && this.values[this.index] === '0') {
+                            this.values[this.index] = '';
+                        }
                         this.date[3] = this.values[this.index] += v;
                         this.index++;
                     } else if (this.values[this.index] < 2 && parseInt(v) < 10) {
+                        if (! two && this.values[this.index] === '0') {
+                            this.values[this.index] = '';
+                        }
                         this.date[3] = this.values[this.index] += v;
                         this.index++;
                     }
@@ -2052,15 +2074,20 @@ function Mask() {
             parser.N60.call(this, v, 5);
         },
         'AM/PM': function(v) {
-            this.values[this.index] = '';
-            if (v) {
-                if (this.date[3] > 12) {
-                    this.values[this.index] = 'PM';
-                } else {
-                    this.values[this.index] = 'AM';
+            if (typeof(this.values[this.index]) === 'undefined') {
+                this.values[this.index] = '';
+            }
+
+            if (this.values[this.index] === '') {
+                if (v.match(/a/i) && this.date[3] < 13) {
+                    this.values[this.index] += 'A';
+                } else if (v.match(/p/i)) {
+                    this.values[this.index] += 'P';
                 }
+            } else if (this.values[this.index] === 'A' || this.values[this.index] === 'P') {
+                this.values[this.index] += 'M';
+                this.index++;
             }
-            this.index++;
         },
         'WD': function(v) {
             if (typeof(this.values[this.index]) === 'undefined') {
@@ -2069,7 +2096,7 @@ function Mask() {
             if (parseInt(v) >= 0 && parseInt(v) < 7) {
                 this.values[this.index] = v;
             }
-            if (this.value[this.index].length == 1) {
+            if (this.values[this.index].length == 1) {
                 this.index++;
             }
         },
@@ -2340,11 +2367,6 @@ function Mask() {
         }
     }
 
-    var isFormula = function(value) {
-        var v = (''+value)[0];
-        return v == '=' ? true : false;
-    }
-
     var toPlainString = function(num) {
         return (''+ +num).replace(/(-?)(\d*)\.?(\d*)e([+-]\d+)/,
           function(a,b,c,d,e) {
@@ -2474,8 +2496,12 @@ function Mask() {
                 if (o.mask.indexOf('##') !== -1) {
                     var d = o.mask.split(';');
                     if (d[0]) {
+                        if (typeof(e) == 'object') {
+                            d[0] = d[0].replace(new RegExp(/_\)/g), '');
+                            d[0] = d[0].replace(new RegExp(/_\(/g), '');
+                        }
                         d[0] = d[0].replace('*', '\t');
-                        d[0] = d[0].replace(new RegExp(/_-/g), ' ');
+                        d[0] = d[0].replace(new RegExp(/_-/g), '');
                         d[0] = d[0].replace(new RegExp(/_/g), '');
                         d[0] = d[0].replace('##0.###','##0.000');
                         d[0] = d[0].replace('##0.##','##0.00');
@@ -2486,6 +2512,12 @@ function Mask() {
                     }
                     o.mask = d[0];
                 }
+                // Remove back slashes
+                if (o.mask.indexOf('\\') !== -1) {
+                    var d = o.mask.split(';');
+                    d[0] = d[0].replace(new RegExp(/\\/g), '');
+                    o.mask = d[0];
+                }
                 // Get type
                 if (! o.type) {
                     o.type = getType.call(o, o.mask);
@@ -2724,6 +2756,10 @@ function Mask() {
         if (options.mask) {
             if (options.mask.indexOf(';') !== -1) {
                 var t = options.mask.split(';');
+                if (! fullMask) {
+                    t[0] = t[0].replace(new RegExp(/_\)/g), '');
+                    t[0] = t[0].replace(new RegExp(/_\(/g), '');
+                }
                 options.mask = t[0];
             }
             options.mask = options.mask.replace(new RegExp(/\[h]/),'|h|');
@@ -3030,7 +3066,11 @@ function Mask() {
                     } else if (s === 'Q') {
                         v = Math.floor((calendar.getMonth() + 3) / 3);
                     } else if (s === 'HH24' || s === 'HH') {
-                        v = helpers.two(this.data[3]);
+                        v = this.data[3];
+                        if (v > 12 && this.tokens.indexOf('am/pm') !== -1) {
+                            v -= 12;
+                        }
+                        v = helpers.two(v);
                     } else if (s === 'HH12') {
                         if (this.data[3] > 12) {
                             v = helpers.two(this.data[3] - 12);
@@ -3039,6 +3079,10 @@ function Mask() {
                         }
                     } else if (s === 'H') {
                         v = this.data[3];
+                        if (v > 12 && this.tokens.indexOf('am/pm') !== -1) {
+                            v -= 12;
+                            v = helpers.two(v);
+                        }
                     } else if (s === 'MI') {
                         v = helpers.two(this.data[4]);
                     } else if (s === 'SS') {
@@ -3075,14 +3119,6 @@ function Mask() {
         return value;
     }
 
-    if (typeof document !== 'undefined') {
-        document.addEventListener('input', function(e) {
-            if (e.target.getAttribute('data-mask') || e.target.mask) {
-                obj(e);
-            }
-        });
-    }
-
     return obj;
 }
 
@@ -12548,8 +12584,11 @@ var sha512_default = /*#__PURE__*/__webpack_require__.n(sha512);
 
 
 var jSuites = {
+    // Helpers
+    ...dictionary,
+    ...helpers,
     /** Current version */
-    version: '5.0.18',
+    version: '5.0.21',
     /** Bind new extensions to Jsuites */
     setExtensions: function(o) {
         if (typeof(o) == 'object') {
@@ -12559,10 +12598,7 @@ var jSuites = {
             }
         }
     },
-    // Helpers
     tracking: Tracking,
-    ...dictionary,
-    ...helpers,
     path: Path,
     sorting: Sorting,
     lazyLoading: LazyLoading,
@@ -12610,11 +12646,11 @@ jSuites.sha512 = (sha512_default());
 
 
 /** Core events */
-var Events = function() {
+const Events = function() {
 
     document.jsuitesComponents = [];
 
-    var find = function(DOMElement, component) {
+    const find = function(DOMElement, component) {
         if (DOMElement[component.type] && DOMElement[component.type] == component) {
             return true;
         }
@@ -12627,7 +12663,7 @@ var Events = function() {
         return false;
     }
 
-    var isOpened = function(e) {
+    const isOpened = function(e) {
         if (document.jsuitesComponents && document.jsuitesComponents.length > 0) {
             for (var i = 0; i < document.jsuitesComponents.length; i++) {
                 if (document.jsuitesComponents[i] && ! find(e, document.jsuitesComponents[i])) {
@@ -12638,26 +12674,26 @@ var Events = function() {
     }
 
     // Width of the border
-    var cornerSize = 15;
+    let cornerSize = 15;
 
     // Current element
-    var element = null;
+    let element = null;
 
     // Controllers
-    var editorAction = false;
+    let editorAction = false;
 
     // Event state
-    var state = {
+    let state = {
         x: null,
         y: null,
     }
 
     // Tooltip element
-    var tooltip = document.createElement('div')
+    let tooltip = document.createElement('div')
     tooltip.classList.add('jtooltip');
 
     // Events
-    var mouseDown = function(e) {
+    const mouseDown = function(e) {
         // Check if this is the floating
         var item = jSuites.findElement(e.target, 'jpanel');
         // Jfloating found
@@ -12730,7 +12766,7 @@ var Events = function() {
         isOpened(element);
     }
 
-    var mouseUp = function(e) {
+    const mouseUp = function(e) {
         if (editorAction && editorAction.e) {
             if (typeof(editorAction.e.refresh) == 'function' && state.actioned) {
                 editorAction.e.refresh();
@@ -12747,7 +12783,7 @@ var Events = function() {
         editorAction = false;
     }
 
-    var mouseMove = function(e) {
+    const mouseMove = function(e) {
         if (editorAction) {
             var x = e.clientX || e.pageX;
             var y = e.clientY || e.pageY;
@@ -12845,7 +12881,7 @@ var Events = function() {
         }
     }
 
-    var mouseOver = function(e) {
+    const mouseOver = function(e) {
         var message = e.target.getAttribute('data-tooltip');
         if (message) {
             // Instructions
@@ -12869,7 +12905,7 @@ var Events = function() {
         }
     }
 
-    var dblClick = function(e) {
+    const dblClick = function(e) {
         var item = jSuites.findElement(e.target, 'jpanel');
         if (item && typeof(item.dblclick) == 'function') {
             // Create edition
@@ -12877,7 +12913,7 @@ var Events = function() {
         }
     }
 
-    var contextMenu = function(e) {
+    const contextMenu = function(e) {
         var item = document.activeElement;
         if (item && typeof(item.contextmenu) == 'function') {
             // Create edition
@@ -12904,10 +12940,10 @@ var Events = function() {
         }
     }
 
-    var keyDown = function(e) {
-        var item = document.activeElement;
+    const keyDown = function(e) {
+        let item = document.activeElement;
         if (item) {
-            if (e.key == "Delete" && typeof(item.delete) == 'function') {
+            if (e.key === "Delete" && typeof(item.delete) == 'function') {
                 item.delete();
                 e.preventDefault();
                 e.stopImmediatePropagation();
@@ -12915,8 +12951,9 @@ var Events = function() {
         }
 
         if (document.jsuitesComponents && document.jsuitesComponents.length) {
-            if (item = document.jsuitesComponents[document.jsuitesComponents.length - 1]) {
-                if (e.key == "Escape" && typeof(item.isOpened) == 'function' && typeof(item.close) == 'function') {
+            item = document.jsuitesComponents[document.jsuitesComponents.length - 1]
+            if (item) {
+                if (e.key === "Escape" && typeof(item.isOpened) == 'function' && typeof(item.close) == 'function') {
                     if (item.isOpened()) {
                         item.close();
                         e.preventDefault();
@@ -12927,6 +12964,12 @@ var Events = function() {
         }
     }
 
+    const input = function(e) {
+        if (e.target.getAttribute('data-mask') || e.target.mask) {
+            jSuites.mask(e);
+        }
+    }
+
     document.addEventListener('mouseup', mouseUp);
     document.addEventListener("mousedown", mouseDown);
     document.addEventListener('mousemove', mouseMove);
@@ -12934,6 +12977,7 @@ var Events = function() {
     document.addEventListener('dblclick', dblClick);
     document.addEventListener('keydown', keyDown);
     document.addEventListener('contextmenu', contextMenu);
+    document.addEventListener('input', input);
 }
 
 if (typeof(document) !== "undefined" && ! document.jsuitesComponents) {

package/package.json

@@ -25,7 +25,7 @@
     },
     "main": "dist/jsuites.js",
     "types": "dist/jsuites.d.ts",
-    "version": "5.0.18",
+    "version": "5.0.21",
     "bugs": "https://github.com/jsuites/jsuites/issues",
     "homepage": "https://github.com/jsuites/jsuites",
     "docs": "https://jsuites.net",