Merge 4.0.0-beta changes

bundles/mobiscroll.common.js

@@ -35,17 +35,15 @@ import '../src/js/i18n/vi';
 import '../src/js/i18n/zh';
 
 // Themes
-import '../src/js/themes/android-holo';
 import '../src/js/themes/ios';
 import '../src/js/themes/material';
-import '../src/js/themes/wp';
+import '../src/js/themes/windows';
 
 // Custom themes
-import '../src/js/themes/android-holo-light';
 import '../src/js/themes/ios-dark';
 import '../src/js/themes/material-dark';
 import '../src/js/themes/mobiscroll-dark';
-import '../src/js/themes/wp-light';
+import '../src/js/themes/windows-dark';
 
 // Auto Theme
 import '../src/js/themes/auto-theme';

bundles/mobiscroll.less

@@ -2,21 +2,17 @@
 @import "../src/less/forms";
 @import "../src/less/scroller";
 // Themes
-// Android Holo
-@import "../src/less/themes/android-holo.forms.less";
-@import "../src/less/themes/android-holo.scroller.less";
 // iOS
 @import "../src/less/themes/ios.forms.less";
 @import "../src/less/themes/ios.scroller.less";
 // Material
 @import "../src/less/themes/material.forms.less";
 @import "../src/less/themes/material.scroller.less";
-// Windows Phone
-@import "../src/less/themes/wp.forms.less";
-@import "../src/less/themes/wp.scroller.less";
+// Windows
+@import "../src/less/themes/windows.forms.less";
+@import "../src/less/themes/windows.scroller.less";
 // Custom themes
-@import (less) "../src/less/themes/android-holo-light.css";
 @import (less) "../src/less/themes/ios-dark.css";
 @import (less) "../src/less/themes/material-dark.css";
 @import (less) "../src/less/themes/mobiscroll-dark.css";
-@import (less) "../src/less/themes/wp-light.css";
+@import (less) "../src/less/themes/windows-dark.css";

examples/kitchen-sink/README.md

@@ -0,0 +1 @@
+Run `npm install` and `grunt build` to build the necessary css and js files into the `dist` folder.

grunt/aliases.js

@@ -3,14 +3,16 @@ module.exports = {
         'babel',
         'less',
         'run:transpile',
-        'rollup:dev'
+        'rollup:dev',
+        'copy:icons'
     ],
     build: [
         'babel',
         'less',
         'run:transpile',
         'rollup:dev',
         'rollup:prod',
+        'copy:icons',
         'copy:metadata',
         'copy:dist'
     ]

grunt/bump.js

@@ -6,7 +6,6 @@ module.exports = {
             'packages/angularjs/package.json',
             'packages/javascript/package.json',
             'packages/jquery/package.json',
-            'packages/knockout/package.json',
             'packages/react/package.json'
         ],
         updateConfigs: [],

grunt/copy.js

@@ -4,14 +4,22 @@ module.exports = {
             expand: true,
             cwd: 'bundles/',
             src: ['*.d.ts', '*.metadata.json'],
-            dest: 'dist/js/',
+            dest: 'dist/js/'
         }, {
             expand: true,
             cwd: 'src/',
             src: ['**/*.d.ts'],
             dest: 'dist/src/'
         }]
     },
+    icons: {
+        files: [{
+            expand: true,
+            cwd: 'src/less/',
+            src: ['icons_mobiscroll.ttf', 'icons_mobiscroll.woff'],
+            dest: 'dist/css/'
+        }]
+    },
     dist: {
         files: [{
             expand: true,
@@ -29,10 +37,6 @@ module.exports = {
             expand: true,
             src: ['dist/**', 'LICENSE'],
             dest: 'packages/jquery/'
-        }, {
-            expand: true,
-            src: ['dist/**', 'LICENSE'],
-            dest: 'packages/knockout/'
         }, {
             expand: true,
             src: ['dist/**', 'LICENSE'],

grunt/less.js

@@ -1,17 +1,4 @@
 module.exports = {
-    androidHoloLight: {
-        options: {
-            modifyVars: {
-                theme: 'android-holo-light',
-                input1: '#31b7e8',
-                input2: '#f5f5f5',
-                input3: '#000000'
-            }
-        },
-        files: {
-            'src/less/themes/android-holo-light.css': 'src/less/templates/android-holo.less'
-        }
-    },
     iosDark: {
         options: {
             modifyVars: {
@@ -52,17 +39,17 @@ module.exports = {
             'src/less/themes/mobiscroll-dark.css': 'src/less/templates/mobiscroll.less'
         }
     },
-    wpLight: {
+    windowsDark: {
         options: {
             modifyVars: {
-                theme: 'wp-light',
+                theme: 'windows-dark',
                 input1: '#1ca1e3',
-                input2: '#dedede',
-                input3: '#000000'
+                input2: '#1f1f1f',
+                input3: '#ffffff'
             }
         },
         files: {
-            'src/less/themes/wp-light.css': 'src/less/templates/wp.less'
+            'src/less/themes/windows-dark.css': 'src/less/templates/windows.less'
         }
     },
     dev: {
@@ -81,4 +68,4 @@ module.exports = {
             'dist/css/mobiscroll.min.css': 'bundles/mobiscroll.less'
         }
     }
-};
+};

grunt/rollup.js

@@ -4,7 +4,6 @@ var uglify = require('rollup-plugin-uglify');
 var globals = {
     angular: 'angular',
     jquery: 'jQuery',
-    knockout: 'ko',
     react: 'React',
     'react-dom': 'ReactDOM',
     'prop-types': 'PropTypes',
@@ -20,7 +19,6 @@ var globals = {
 var external = [
     'angular',
     'jquery',
-    'knockout',
     'prop-types',
     'react',
     'react-dom',
@@ -55,7 +53,6 @@ module.exports = {
         files: {
             'dist/js/mobiscroll.angular.js': 'bundles/mobiscroll.angular.min.js',
             'dist/js/mobiscroll.angularjs.js': 'bundles/mobiscroll.angularjs.js',
-            'dist/js/mobiscroll.knockout.js': 'bundles/mobiscroll.knockout.js',
             'dist/js/mobiscroll.javascript.js': 'bundles/mobiscroll.javascript.js',
             'dist/js/mobiscroll.jquery.js': 'bundles/mobiscroll.jquery.js',
             'dist/js/mobiscroll.react.js': 'bundles/mobiscroll.react.js'
@@ -88,7 +85,6 @@ module.exports = {
         files: {
             'dist/js/mobiscroll.angular.min.js': 'bundles/mobiscroll.angular.min.js',
             'dist/js/mobiscroll.angularjs.min.js': 'bundles/mobiscroll.angularjs.js',
-            'dist/js/mobiscroll.knockout.min.js': 'bundles/mobiscroll.knockout.js',
             'dist/js/mobiscroll.javascript.min.js': 'bundles/mobiscroll.javascript.js',
             'dist/js/mobiscroll.jquery.min.js': 'bundles/mobiscroll.jquery.js',
             'dist/js/mobiscroll.react.min.js': 'bundles/mobiscroll.react.js'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobiscroll",
-  "version": "3.2.6",
+  "version": "4.0.0-beta",
   "description": "Cross platform UI controls for progressive web an hybrid apps",
   "homepage": "https://mobiscroll.com/",
   "license": "Apache-2.0",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll-angular",
-    "version": "3.2.6",
+    "version": "4.0.0-beta",
     "description": "Angular UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

packages/angularjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll-angularjs",
-    "version": "3.2.6",
+    "version": "4.0.0-beta",
     "description": "AngularJS UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

packages/javascript/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll-javascript",
-    "version": "3.2.6",
+    "version": "4.0.0-beta",
     "description": "Framework agnostic UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

packages/jquery/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll-jquery",
-    "version": "3.2.6",
+    "version": "4.0.0-beta",
     "description": "jQuery and jQuery Mobile UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",