Merge 4.7.2 changes

.jsbeautifyrc

@@ -1,7 +1,4 @@
 {
-    // Details: https://github.com/victorporof/Sublime-HTMLPrettify#using-your-own-jsbeautifyrc-options
-    // Documentation: https://github.com/einars/js-beautify/
-
     "html": {
         "allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg"],
         "space_after_anon_function": true,
@@ -10,7 +7,8 @@
     "css": {
         "allowed_file_extensions": ["css", "scss", "sass", "less"],
         "end_with_newline": true,
-        "space_around_combinator": true
+        "space_around_combinator": true,
+        "indent_size": 2
     },
     "js": {
         "allowed_file_extensions": ["js", "jsx", "json", "jshintrc", "jsbeautifyrc"],
@@ -19,4 +17,4 @@
         "space_after_anon_function": true,
         "end_with_newline": true
     }
-}
+}

bundles/mobiscroll.angular.min.js

@@ -1,4 +1,4 @@
 export * from './mobiscroll.angular';
-export { MbscAccordion as ɵp, MbscFormGroup as ɵm, MbscFormGroupContent as ɵo, MbscFormGroupTitle as ɵn, MbscRadioGroupBase as ɵl, MbscRadioService as ɵk } from '../src/js/forms.angular';
+export { MbscAccordion as ɵo, MbscFormGroup as ɵl, MbscFormGroupContent as ɵn, MbscFormGroupTitle as ɵm, 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';
-export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi, MbscInputModule as ɵj } from '../src/js/input.angular';
+export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi } from '../src/js/input.angular';

bundles/mobiscroll.angular.scss

@@ -0,0 +1,3 @@
+$mbsc-font-path: '~@mobiscroll/angular-lite/dist/css/' !default;
+
+@import "mobiscroll";

bundles/mobiscroll.javascript.scss

@@ -0,0 +1,3 @@
+$mbsc-font-path: '~@mobiscroll/javascript-lite/dist/css/' !default;
+
+@import "mobiscroll";

bundles/mobiscroll.jquery.scss

@@ -0,0 +1,3 @@
+$mbsc-font-path: '~@mobiscroll/jquery-lite/dist/css/' !default;
+
+@import "mobiscroll";

bundles/mobiscroll.ng.scss

@@ -0,0 +1,3 @@
+$mbsc-font-path: '~@mobiscroll/angularjs-lite/dist/css/' !default;
+
+@import "mobiscroll";

bundles/mobiscroll.react.scss

@@ -0,0 +1,3 @@
+$mbsc-font-path: '~@mobiscroll/react-lite/dist/css/' !default;
+
+@import "mobiscroll";

bundles/mobiscroll.scss

@@ -0,0 +1,52 @@
+// Forms
+@import "../src/scss/forms/forms";
+@import "../src/scss/forms/forms.bootstrap";
+@import "../src/scss/forms/forms.ios";
+@import "../src/scss/forms/forms.material";
+@import "../src/scss/forms/forms.mobiscroll";
+@import "../src/scss/forms/forms.windows";
+
+// Grid Layout
+@import "../src/scss/grid-layout/grid-layout";
+
+// Create theme builder functions
+
+@mixin mbsc-ios-theme($theme, $params) {
+  @include mbsc-ios-forms($theme, $params);
+}
+
+@mixin mbsc-material-theme($theme, $params) {
+  @include mbsc-material-forms($theme, $params);
+}
+
+@mixin mbsc-mobiscroll-theme($theme, $params) {
+  @include mbsc-mobiscroll-forms($theme, $params);
+}
+
+@mixin mbsc-windows-theme($theme, $params) {
+  @include mbsc-windows-forms($theme, $params);
+}
+
+@mixin mbsc-custom-theme($theme, $base-theme, $colors) {
+  @if $base-theme=='ios' {
+    @include mbsc-ios-theme($theme, $colors);
+  }
+
+  @else if $base-theme=='material' {
+    @include mbsc-material-theme($theme, $colors);
+  }
+
+  @else if $base-theme=='mobiscroll' {
+    @include mbsc-mobiscroll-theme($theme, $colors);
+  }
+
+  @else if $base-theme=='windows' {
+    @include mbsc-windows-theme($theme, $colors);
+  }
+}
+
+// Create dark theme variants
+@include mbsc-ios-theme('ios-dark', ('background': $mbsc-ios-dark-background, 'text': $mbsc-ios-dark-text, 'accent': $mbsc-ios-dark-accent));
+@include mbsc-material-theme('material-dark', ('background': $mbsc-material-dark-background, 'text': $mbsc-material-dark-text, 'accent': $mbsc-material-dark-accent));
+@include mbsc-mobiscroll-theme('mobiscroll-dark', ('background': $mbsc-mobiscroll-dark-background, 'text': $mbsc-mobiscroll-dark-text, 'accent': $mbsc-mobiscroll-dark-accent));
+@include mbsc-windows-theme('windows-dark', ('background': $mbsc-windows-dark-background, 'text': $mbsc-windows-dark-text, 'accent': $mbsc-windows-dark-accent));

examples/angular/.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

examples/angular/.gitignore

@@ -4,10 +4,16 @@
 /dist
 /tmp
 /out-tsc
+# Only exists if Bazel was run
+/bazel-out
 
 # dependencies
 /node_modules
 
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
+
 # IDEs and editors
 /.idea
 .project
@@ -23,20 +29,18 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
 
-# e2e
-/e2e/*.js
-/e2e/*.map
-
 # System Files
 .DS_Store
 Thumbs.db

examples/angular/README.md

@@ -1,6 +1,6 @@
 # Angular
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.4.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.1.
 
 ## Development server
 
@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
 ## Running unit tests
 

examples/angular/angular.json

@@ -4,30 +4,41 @@
   "newProjectRoot": "projects",
   "projects": {
     "angular": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
       "root": "",
       "sourceRoot": "src",
-      "projectType": "application",
+      "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist",
+            "outputPath": "dist/angular",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "tsConfig": "src/tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/assets",
-              "src/favicon.ico"
+              "src/favicon.ico",
+              "src/assets"
             ],
             "styles": [
-              "node_modules/@mobiscroll/angular-lite/dist/css/mobiscroll.min.css",
-              "src/styles.css"
+              "src/styles.scss"
             ],
             "scripts": []
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -37,10 +48,11 @@
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
-              "fileReplacements": [
+              "budgets": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
                 }
               ]
             }
@@ -67,68 +79,45 @@
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "karmaConfig": "./karma.conf.js",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "scripts": [],
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
             "styles": [
-              "node_modules/@mobiscroll/angular-lite/dist/css/mobiscroll.min.css",
-              "src/styles.css"
+              "src/styles.scss"
             ],
-            "assets": [
-              "src/assets",
-              "src/favicon.ico"
-            ]
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "angular-e2e": {
-      "root": "e2e",
-      "sourceRoot": "e2e",
-      "projectType": "application",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "./protractor.conf.js",
+            "protractorConfig": "e2e/protractor.conf.js",
             "devServerTarget": "angular:serve"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "angular:serve:production"
+            }
           }
         }
       }
-    }
-  },
-  "defaultProject": "angular",
-  "schematics": {
-    "@schematics/angular:component": {
-      "prefix": "app",
-      "styleext": "css"
-    },
-    "@schematics/angular:directive": {
-      "prefix": "app"
-    }
-  }
+    }},
+  "defaultProject": "angular"
 }

examples/angular/browserslist

@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.