Merging 4.2.0 changes

acidb · May 1, 2018 · 18b22ae · 18b22ae
1 parent 187bb34
commit 18b22ae
Show file tree

Hide file tree

Showing 44 changed files with 629 additions and 278 deletions.
diff --git a/bundles/mobiscroll.angular.min.js b/bundles/mobiscroll.angular.min.js
@@ -1,3 +1,3 @@
 export * from './mobiscroll.angular';
-export { MbscFormBase as ɵf, MbscFormValueBase as ɵg, MbscInputBase as ɵh, MbscRadioGroupBase as ɵj, MbscRadioService as ɵi } from '../src/js/forms.angular';
-export { MbscBase as ɵc, MbscControlBase as ɵe, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
+export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi, MbscRadioGroupBase as ɵk, MbscRadioService as ɵj } from '../src/js/forms.angular';
+export { MbscBase as ɵc, MbscCloneBase as ɵe, MbscControlBase as ɵf, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
diff --git a/grunt/copy.js b/grunt/copy.js
@@ -8,8 +8,18 @@ module.exports = {
         }, {
             expand: true,
             cwd: 'src/',
-            src: ['**/*.d.ts'],
+            src: ['**/*.d.ts', '!js/frameworks/*.d.ts', 'js/frameworks/angular.d.ts'],
             dest: 'packages/angular/src/'
+        }, {
+            expand: true,
+            cwd: 'src/',
+            src: ['**/*.d.ts', '!**/*.angular.d.ts', '!js/frameworks/*.d.ts', 'js/frameworks/javascript.d.ts'],
+            dest: 'packages/javascript/dist/'
+        }, {
+            expand: true,
+            cwd: 'src/',
+            src: ['**/*.d.ts', '!**/*.angular.d.ts', '!js/frameworks/*.d.ts', 'js/frameworks/jquery.d.ts'],
+            dest: 'packages/jquery/dist/'
         }]
     },
     icons: {
@@ -32,19 +42,19 @@ module.exports = {
             dest: 'packages/angular/'
         }, {
             expand: true,
-            src: ['dist/js/mobiscroll.angularjs.js', 'dist/css/*', 'LICENSE'],
+            src: ['dist/js/mobiscroll.angularjs.js', 'dist/js/mobiscroll.angularjs.min.js', 'dist/css/*', 'LICENSE'],
             dest: 'packages/angularjs/'
         }, {
             expand: true,
-            src: ['dist/js/mobiscroll.javascript.js', 'dist/css/*', 'LICENSE'],
+            src: ['dist/js/mobiscroll.javascript.js', 'dist/js/mobiscroll.javascript.min.js', 'dist/css/*', 'LICENSE'],
             dest: 'packages/javascript/'
         }, {
             expand: true,
-            src: ['dist/js/mobiscroll.jquery.js', 'dist/css/*', 'LICENSE'],
+            src: ['dist/js/mobiscroll.jquery.js', 'dist/js/mobiscroll.jquery.min.js', 'dist/css/*', 'LICENSE'],
             dest: 'packages/jquery/'
         }, {
             expand: true,
-            src: ['dist/js/mobiscroll.react.js', 'dist/css/*', 'LICENSE'],
+            src: ['dist/js/mobiscroll.react.js', 'dist/js/mobiscroll.react.min.js', 'dist/css/*', 'LICENSE'],
             dest: 'packages/react/'
         }]
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobiscroll",
-  "version": "4.1.1",
+  "version": "4.2.1",
   "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.1.1",
+    "version": "4.2.1",
     "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.1.1",
+    "version": "4.2.1",
     "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.1.1",
+    "version": "4.2.1",
     "description": "Framework agnostic UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",
@@ -26,13 +26,15 @@
         "url": "https://github.com/acidb/mobiscroll/issues"
     },
     "main": "dist/js/mobiscroll.javascript.min.js",
+    "typings": "dist/src/js/frameworks/javascript.d.ts",
     "style": "dist/css/mobiscroll.min.css",
     "files": [
         "dist/js/mobiscroll.javascript.js",
         "dist/js/mobiscroll.javascript.min.js",
         "dist/css/mobiscroll.css",
         "dist/css/mobiscroll.min.css",
         "dist/css/icons_mobiscroll.ttf",
-        "dist/css/icons_mobiscroll.woff"
+        "dist/css/icons_mobiscroll.woff",
+        "dist/src/**"
     ]
 }
diff --git a/packages/jquery/package.json b/packages/jquery/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/jquery-lite",
-    "version": "4.1.1",
+    "version": "4.2.1",
     "description": "jQuery and jQuery Mobile UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",
@@ -27,14 +27,16 @@
         "url": "https://github.com/acidb/mobiscroll/issues"
     },
     "main": "dist/js/mobiscroll.jquery.min.js",
+    "typings": "dist/src/js/frameworks/jquery.d.ts",
     "style": "dist/css/mobiscroll.min.css",
     "files": [
         "dist/js/mobiscroll.jquery.js",
         "dist/js/mobiscroll.jquery.min.js",
         "dist/css/mobiscroll.css",
         "dist/css/mobiscroll.min.css",
         "dist/css/icons_mobiscroll.ttf",
-        "dist/css/icons_mobiscroll.woff"
+        "dist/css/icons_mobiscroll.woff",
+        "dist/src/**"
     ],
     "peerDependencies": {
         "jquery": ">=1.7.0"

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

diff --git a/src/js/classes/frame.js b/src/js/classes/frame.js
@@ -560,7 +560,7 @@ export const Frame = function (el, settings, inherit) {
                 });
 
                 that.tap($elm, function (ev) {
-                    if (ev.type == 'touchend') {
+                    if (ev.isMbscTap) {
                         touched = true;
                     }
                     show(beforeShow, $elm);

diff --git a/src/js/core/core.d.ts b/src/js/core/core.d.ts
@@ -1,5 +1,5 @@
-import { mobiscroll } from './mobiscroll';
-export { mobiscroll };
+import { mobiscroll, IMobiscroll } from './mobiscroll';
+export { mobiscroll, IMobiscroll };
 export const $: any;
 export const extend: any;
 

diff --git a/src/js/core/core.js b/src/js/core/core.js
@@ -1,12 +1,12 @@
 /*!
- * Mobiscroll v4.1.1
+ * Mobiscroll v4.2.0
  * http://mobiscroll.com
  *
  * Copyright 2010-2018, Acid Media
  *
  */
 
-import { mobiscroll } from './mobiscroll';
+import { mobiscroll, util } from './mobiscroll';
 import { os, majorVersion, minorVersion, isBrowser } from '../util/platform';
 import { noop, vibrate } from '../util/misc';
 import { getCoord, preventClick, tap } from '../util/tap';
@@ -59,16 +59,17 @@ var ms,
     id = +new Date(),
     instances = {},
     classes = {},
-    util = {
-        getCoord: getCoord,
-        preventClick: preventClick,
-        vibrate: vibrate
-    },
     extend = $.extend;
 
+extend(util, {
+    getCoord: getCoord,
+    preventClick: preventClick,
+    vibrate: vibrate
+});
+
 ms = extend(mobiscroll, {
     $: $,
-    version: '4.1.1',
+    version: '4.2.0',
     autoTheme: 'mobiscroll',
     themes: {
         form: {},

diff --git a/src/js/core/mobiscroll.d.ts b/src/js/core/mobiscroll.d.ts
@@ -1,22 +1,23 @@
-declare namespace mobiscroll {
-    let settings: any;
-    let $: any;
-    let apiKey: string;
-    let apiUrl: string;
-    let uid: string;
-    let util: {
-        datetime: {
+export interface IMobiscroll {
+    settings?: any,
+    $?: any,
+    apiKey?: string,
+    apiUrl?: string,
+    uid?: string,
+    util?: {
+        datetime?: {
             parseDate: (format: string, value: string, settings?: any) => Date,
             formatDate: (format: string, value: Date, settings?: any) => string
         }
-    };
+    },
 
-    function alert(config: any): Promise<boolean>;
-    function confirm(config: any): Promise<boolean>;
-    function prompt(config: any): Promise<string>;
-    function toast(config: any): Promise<boolean>;
-    function snackbar(config: any): Promise<boolean>;
+    alert?: (config: any) => Promise<boolean>,
+    confirm?: (config: any) => Promise<boolean>,
+    prompt?: (config: any) => Promise<string>,
+    toast?: (config: any) => Promise<boolean>,
+    snackbar?: (config: any) => Promise<boolean>,
 
-    function customTheme(name: string, baseTheme: string): void;
+    customTheme: (name: string, baseTheme: string) => void
 }
-export { mobiscroll };
+
+export const mobiscroll: IMobiscroll;
diff --git a/src/js/core/mobiscroll.js b/src/js/core/mobiscroll.js
@@ -1,3 +1,4 @@
-var mobiscroll = mobiscroll || {};
+var mobiscroll = mobiscroll || {},
+    util = {};
 
-export { mobiscroll };
+export { mobiscroll, util };
diff --git a/src/js/forms.angular.ts b/src/js/forms.angular.ts
@@ -621,6 +621,7 @@ export class MbscSwitch extends MbscControlBase implements OnInit {
 
     ngOnInit() {
         this._inheritedOptions = this._formService ? this._formService.options : {};
+        super.ngOnInit();
     }
 
     ngAfterViewInit() {
@@ -734,6 +735,7 @@ export class MbscStepper extends MbscControlBase implements OnInit {
 
     ngOnInit() {
         this._inheritedOptions = this._formService ? this._formService.options : {};
+        super.ngOnInit();
     }
 
     /* AfterViewInit Interface */
@@ -838,6 +840,7 @@ export class MbscProgress extends MbscControlBase implements OnInit {
 
     ngOnInit() {
         this._inheritedOptions = this._formService ? this._formService.options : {};
+        super.ngOnInit();
     }
 
     /* AfterViewInit Interface */
@@ -1306,6 +1309,7 @@ export class MbscSlider extends MbscControlBase {
 
     ngOnInit() {
         this._inheritedOptions = this._formService ? this._formService.options : {};
+        super.ngOnInit();
     }
 
     /* AfterViewInit Interface */
@@ -1427,6 +1431,7 @@ export class MbscRating extends MbscControlBase implements OnInit {
 
     ngOnInit() {
         this._inheritedOptions = this.formService ? this.formService.options : {};
+        super.ngOnInit();
     }
 
     ngAfterViewInit() {