Merging 4.4.2 changes

acidb · Nov 5, 2018 · e47e7d5 · e47e7d5
1 parent 065d32c
commit e47e7d5
Show file tree

Hide file tree

Showing 34 changed files with 244 additions and 92 deletions.
diff --git a/examples/angular/package-lock.json b/examples/angular/package-lock.json
diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -21,7 +21,7 @@
         "@angular/platform-browser": "^5.2.11",
         "@angular/platform-browser-dynamic": "^5.2.11",
         "@angular/router": "^5.2.11",
-        "@mobiscroll/angular-lite": "^4.4.0",
+        "@mobiscroll/angular-lite": "^4.4.2",
         "core-js": "^2.5.7",
         "rxjs": "^5.5.11",
         "zone.js": "^0.8.26"

diff --git a/examples/react/package-lock.json b/examples/react/package-lock.json
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -3,7 +3,7 @@
     "version": "0.1.0",
     "private": true,
     "dependencies": {
-        "@mobiscroll/react-lite": "^4.4.0",
+        "@mobiscroll/react-lite": "^4.4.2",
         "react": "^16.4.1",
         "react-dom": "^16.4.1",
         "react-scripts": "^1.1.4"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobiscroll",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "Cross platform UI controls for progressive web an hybrid apps",
   "homepage": "https://mobiscroll.com/",
   "license": "Apache-2.0",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/angular-lite",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "description": "Angular UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/angularjs/package.json b/packages/angularjs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/angularjs-lite",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "description": "AngularJS UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/javascript/package.json b/packages/javascript/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/javascript-lite",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "description": "Framework agnostic UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/jquery/package.json b/packages/jquery/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/jquery-lite",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "description": "jQuery and jQuery Mobile UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/react-lite",
-    "version": "4.4.1",
+    "version": "4.4.2",
     "description": "React UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/src/js/classes/form-control.js b/src/js/classes/form-control.js
@@ -1,11 +1,11 @@
 import { $, extend, mobiscroll } from '../core/core';
 import { activateControl, getControlType, getCoord, tap } from '../util/tap';
-import { testTouch, hasTouchAction } from '../util/dom';
+import { testTouch, hasGhostClick } from '../util/dom';
 
 const wrapClass = 'mbsc-input-wrap';
 const events = ['touchstart', 'touchmove', 'touchend', 'touchcancel', 'mousedown', 'mousemove', 'mouseup', 'mouseleave'];
 const defaults = {
-    tap: !hasTouchAction
+    tap: hasGhostClick
 };
 
 let $active;
@@ -42,6 +42,7 @@ function addIcon($control, ic) {
         $parent
             .addClass((icons.right ? 'mbsc-ic-right ' : '') + (icons.left ? ' mbsc-ic-left' : ''))
             .find('.' + wrapClass)
+            .append('<span class="mbsc-input-fill"></span>')
             .append(icons.left ? '<span class="mbsc-input-ic mbsc-left-ic mbsc-ic mbsc-ic-' + icons.left + '"></span>' : '')
             .append(icons.right ? '<span class="mbsc-input-ic mbsc-right-ic mbsc-ic mbsc-ic-' + icons.right + '"></span>' : '');
     }

diff --git a/src/js/classes/forms.js b/src/js/classes/forms.js
@@ -1,5 +1,5 @@
 import { $, Base, mobiscroll, classes, autoInit } from '../core/core';
-import { hasTouchAction } from '../util/dom';
+import { hasGhostClick } from '../util/dom';
 import { os, majorVersion } from '../util/platform';
 import { initControls } from '../util/forms';
 import '../util/notifications';
@@ -86,7 +86,7 @@ Form.prototype = {
     _hasLang: true,
     _class: 'form',
     _defaults: {
-        tap: !hasTouchAction,
+        tap: hasGhostClick,
         stopProp: true,
         rtl: false
     }

diff --git a/src/js/classes/frame.d.ts b/src/js/classes/frame.d.ts
@@ -12,6 +12,7 @@ export interface MbscFrameOptions extends MbscCoreOptions {
     focusOnClose?: boolean | string | HTMLElement;
     focusTrap?: boolean;
     headerText?: string | boolean | ((formattedValue: string) => string);
+    scrollLock?: boolean;
     showOnFocus?: boolean;
     showOnTap?: boolean;
     touchUi?: boolean;

diff --git a/src/js/classes/frame.js b/src/js/classes/frame.js
@@ -18,6 +18,7 @@ var $activeElm,
     };
 
 const EDITABLE = 'input,select,textarea,button';
+const ALLOW_ENTER = 'textarea,button,input[type="button"],input[type="submit"]';
 const FOCUSABLE = EDITABLE + ',[tabindex="0"]';
 
 export const Frame = function (el, settings, inherit) {
@@ -49,6 +50,7 @@ export const Frame = function (el, settings, inherit) {
         overlay,
         popup,
         posDebounce,
+        prevInst,
         s,
         scrollLeft,
         scrollLock,
@@ -97,10 +99,12 @@ export const Frame = function (el, settings, inherit) {
     }
 
     function onWndKeyDown(ev) {
-        if (ev.keyCode == 13 && !$(ev.target).is(EDITABLE)) {
-            that.select();
-        } else if (ev.keyCode == 27) {
-            that.cancel();
+        if (mobiscroll.activeInstance == that) {
+            if (ev.keyCode == 13 && (!$(ev.target).is(ALLOW_ENTER) || ev.shiftKey)) {
+                that.select();
+            } else if (ev.keyCode == 27) {
+                that.cancel();
+            }
         }
     }
 
@@ -143,6 +147,9 @@ export const Frame = function (el, settings, inherit) {
                     $wnd.scrollLeft(scrollLeft);
                     $wnd.scrollTop(scrollTop);
                 }
+            }
+
+            if (!ctx.mbscModals || prevInst) {
                 // Put focus back to the last active element
                 if (!prevAnim) {
                     if (!$activeEl) {
@@ -160,6 +167,7 @@ export const Frame = function (el, settings, inherit) {
             }
         }
 
+        prevInst = undefined;
         isInserted = false;
 
         trigger('onHide');
@@ -181,8 +189,8 @@ export const Frame = function (el, settings, inherit) {
     }
 
     function onFocus(ev) {
-        if (ev.target.nodeType && !overlay.contains(ev.target) && lastFocus - new Date() > 100) {
-            overlay.focus();
+        if (mobiscroll.activeInstance == that && ev.target.nodeType && !overlay.contains(ev.target) && new Date() - lastFocus > 100) {
+            that._activeElm.focus();
             lastFocus = new Date();
         }
     }
@@ -703,10 +711,8 @@ export const Frame = function (el, settings, inherit) {
                 document.activeElement.blur();
             }
 
-            // Hide active instance
-            if (mobiscroll.activeInstance) {
-                mobiscroll.activeInstance.hide();
-            }
+            // Save active instance to previous
+            prevInst = mobiscroll.activeInstance;
 
             // Set active instance
             mobiscroll.activeInstance = that;
@@ -892,7 +898,7 @@ export const Frame = function (el, settings, inherit) {
                 document.activeElement.blur();
             }
             if (mobiscroll.activeInstance == that) {
-                delete mobiscroll.activeInstance;
+                mobiscroll.activeInstance = prevInst;
             }
             $(window).off('keydown', onWndKeyDown);
         }

diff --git a/src/js/classes/input.js b/src/js/classes/input.js
@@ -14,6 +14,14 @@ export class Input extends FormControl {
         events.forEach(ev => {
             elm.addEventListener(ev, this);
         });
+
+        setTimeout(() => {
+            // if label is floating and input is autofill, add floating active class
+            // input has no value yet
+            if (this._isFloating && this._$elm.is("*:-webkit-autofill")) {
+                this._$parent.addClass('mbsc-label-floating-active');
+            }
+        });
     }
 
     handleEvent(ev) {

diff --git a/src/js/classes/scroller.js b/src/js/classes/scroller.js
@@ -14,6 +14,10 @@ var presets = {},
     has3d = css && css.supports && css.supports("(transform-style: preserve-3d)"),
     force2D = !has3d || os == 'wp' || os == 'android';
 
+function sanitize(str) {
+    return (str + '').replace('"', '___');
+}
+
 export { presets };
 
 export const Scroller = function (el, settings, inherit) {
@@ -252,7 +256,7 @@ export const Scroller = function (el, settings, inherit) {
                 (invalid ? ' mbsc-sc-itm-inv-h mbsc-disabled' : '') +
                 (disabled[value] ? ' mbsc-sc-itm-inv mbsc-disabled' : '') +
                 '" data-index="' + i +
-                '" data-val="' + value + '"' +
+                '" data-val="' + sanitize(value) + '"' +
                 (lbl ? ' aria-label="' + lbl + '"' : '') +
                 (selected ? ' aria-selected="true"' : '') +
                 ' style="height:' + itemHeight + 'px;line-height:' + itemHeight + 'px;' +
@@ -379,7 +383,7 @@ export const Scroller = function (el, settings, inherit) {
                     $.each(ret.disabled[i], function (j, v) {
                         wheel._disabled[v] = true;
                         if (isVisible) {
-                            wheel._$markup.find('.mbsc-sc-itm[data-val="' + v + '"]').addClass('mbsc-sc-itm-inv mbsc-disabled');
+                            wheel._$markup.find('.mbsc-sc-itm[data-val="' + sanitize(v) + '"]').addClass('mbsc-sc-itm-inv mbsc-disabled');
                         }
                     });
                 }
@@ -414,15 +418,15 @@ export const Scroller = function (el, settings, inherit) {
                         if (index === undefined) {
                             for (var v in that._tempSelected[i]) {
                                 wheel._$markup
-                                    .find('.mbsc-sc-itm[data-val="' + v + '"]')
+                                    .find('.mbsc-sc-itm[data-val="' + sanitize(v) + '"]')
                                     .addClass(selectedClass)
                                     .attr('aria-selected', 'true');
                             }
                         }
                     } else {
                         // Mark element as aria selected
                         wheel._$markup
-                            .find('.mbsc-sc-itm[data-val="' + tempWheelArray[i] + '"]')
+                            .find('.mbsc-sc-itm[data-val="' + sanitize(tempWheelArray[i]) + '"]')
                             .addClass('mbsc-sc-itm-sel')
                             .attr('aria-selected', 'true');
                     }

diff --git a/src/js/core/core.js b/src/js/core/core.js
@@ -1,5 +1,5 @@
 /*!
- * Mobiscroll v4.4.1
+ * Mobiscroll v4.4.2
  * http://mobiscroll.com
  *
  * Copyright 2010-2018, Acid Media
@@ -76,7 +76,7 @@ extend(util, {
 
 ms = extend(mobiscroll, {
     $: $,
-    version: '4.4.1',
+    version: '4.4.2',
     autoTheme: 'mobiscroll',
     themes: {
         form: {},

diff --git a/src/js/forms.angular.ts b/src/js/forms.angular.ts
@@ -1568,7 +1568,8 @@ export class MbscRating extends MbscControlBase implements OnInit {
     selector: 'mbsc-form-group',
     template: '<ng-content></ng-content>',
     host: {
-        '[class]': "inset !== undefined ? 'mbsc-form-group-inset' : 'mbsc-form-group'"
+        '[class.mbsc-form-group-inset]': 'inset !== undefined',
+        '[class.mbsc-form-group]': 'inset === undefined'
     },
     styles: [':host { display: block; }']
 })
@@ -1589,6 +1590,7 @@ export class MbscFormGroup implements AfterViewInit {
         this._open = v;
     }
 
+    /** Note on type: using as attribute without a value (empty string) */
     @Input()
     inset: string;
 
@@ -1633,7 +1635,7 @@ export class MbscFormGroup implements AfterViewInit {
     selector: 'mbsc-form-group-title',
     template: '<ng-content></ng-content>',
     host: {
-        'class': 'mbsc-form-group-title'
+        '[class.mbsc-form-group-title]': 'true'
     },
     styles: [':host { display: block; }']
 })
@@ -1643,7 +1645,7 @@ export class MbscFormGroupTitle { }
     selector: 'mbsc-form-group-content',
     template: '<ng-content></ng-content>',
     host: {
-        'class': 'mbsc-form-group-content'
+        '[class.mbsc-form-group-content]': 'true'
     },
     styles: [':host { display: block; }']
 })
@@ -1653,7 +1655,7 @@ export class MbscFormGroupContent { }
     selector: 'mbsc-accordion',
     template: '<ng-content></ng-content>',
     host: {
-        'class': 'mbsc-accordion'
+        '[class.mbsc-accordion]': 'true'
     },
     styles: [':host { display: block; }']
 })