Merging 3.2.6 changes

acidb · Nov 6, 2017 · daf0d65 · daf0d65
1 parent cc24c95
commit daf0d65
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobiscroll",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "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",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "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",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "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",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "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",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "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/knockout/package.json b/packages/knockout/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll-knockout",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "description": "Knockout 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",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "description": "React UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/src/js/core/core.js b/src/js/core/core.js
@@ -1,5 +1,5 @@
 /*!
- * Mobiscroll v3.2.5
+ * Mobiscroll v3.2.6
  * http://mobiscroll.com
  *
  * Copyright 2010-2016, Acid Media
@@ -10,7 +10,7 @@
 import mobiscroll from './mobiscroll';
 import { os, majorVersion, minorVersion, isBrowser } from '../util/platform';
 import { noop, vibrate } from '../util/misc';
-import { preventClick, tap } from '../util/tap';
+import { getCoord, preventClick, tap } from '../util/tap';
 
 export default mobiscroll;
 
@@ -22,8 +22,9 @@ var ms,
 
 ms = extend(mobiscroll, {
     $: $,
-    version: '3.2.5',
+    version: '3.2.6',
     util: {
+        getCoord: getCoord,
         preventClick: preventClick,
         vibrate: vibrate
     },

diff --git a/src/js/i18n/ar.js b/src/js/i18n/ar.js
@@ -11,7 +11,6 @@ mobiscroll.i18n.ar = {
     cancelText: 'إلغاء',
     clearText: 'مسح',
     selectedText: '{count} المحدد',
-    selectedPluralText: '{count} المحدد',
     // Datetime component
     dateFormat: 'dd/mm/yy',
     dayNames: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],

diff --git a/src/js/util/notifications.js b/src/js/util/notifications.js
@@ -109,7 +109,7 @@ function showPrompt(widget, settings, resolve) {
             inst._resolve = input.value;
         }
     }));
-    inst._resolve = '';
+    inst._resolve = null;
     showPopup(inst);
 }
 

diff --git a/src/less/forms.less b/src/less/forms.less
@@ -30,6 +30,12 @@
     margin: 2em 1.5em;
 }
 
+.mbsc-form-group,
+.mbsc-form-group-inset {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
+
 
 /* No background inside widget */
 
@@ -44,13 +50,6 @@
     display: block;
 }
 
-
-/* RTL mode */
-
-.mbsc-rtl {
-    direction: rtl;
-}
-
 .mbsc-err-msg {
     display: block;
     font-size: .75em;

diff --git a/src/less/frame.less b/src/less/frame.less
@@ -142,6 +142,19 @@
     max-width: 100%;
 }
 
+.mbsc-fr-top .mbsc-fr-w,
+.mbsc-fr-bottom .mbsc-fr-w {
+    padding-left: constant(safe-area-inset-left);
+    padding-left: env(safe-area-inset-left);
+    padding-right: constant(safe-area-inset-right);
+    padding-right: env(safe-area-inset-right);
+}
+
+.mbsc-fr-bottom .mbsc-fr-w {
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+}
+
 
 /* Inline mode */
 

diff --git a/src/less/page.less b/src/less/page.less
@@ -15,6 +15,12 @@
     -webkit-tap-highlight-color: transparent;
     -webkit-touch-callout: none;
     -webkit-text-size-adjust: 100%;
+    padding-left: constant(safe-area-inset-left);
+    padding-left: env(safe-area-inset-left);
+    padding-right: constant(safe-area-inset-right);
+    padding-right: env(safe-area-inset-right);
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
 }
 
 .mbsc-page,

diff --git a/src/less/themes/ios.forms.less b/src/less/themes/ios.forms.less
@@ -26,10 +26,6 @@
     color: #7f8797;
 }
 
-.mbsc-ios .mbsc-padding {
-    padding: 1em;
-}
-
 .mbsc-ios .mbsc-desc {
     opacity: .5;
 }
@@ -68,6 +64,7 @@
 }
 
 .mbsc-ios .mbsc-form-group-inset .mbsc-form-group-title,
+.mbsc-ios .mbsc-form-group-inset .mbsc-form-group-title + .mbsc-control-w:before,
 .mbsc-ios .mbsc-form-group-inset .mbsc-control-w:first-child:before,
 .mbsc-ios .mbsc-form-group-inset .mbsc-control-w:last-child:after {
     border-width: 0;
@@ -277,6 +274,7 @@
     bottom: 0;
 }
 
+.mbsc-ios .mbsc-form-group-title + .mbsc-control-w:before,
 .mbsc-ios .mbsc-control-w:first-child:before,
 .mbsc-ios .mbsc-control-w:last-child:after {
     left: 0;
@@ -287,6 +285,7 @@
     left: 1em;
 }
 
+.mbsc-ios .mbsc-form-group-title + .mbsc-control-ng .mbsc-control-w:before,
 .mbsc-ios .mbsc-control-ng:first-child .mbsc-control-w:before,
 .mbsc-ios .mbsc-control-ng:last-child .mbsc-control-w:after {
     left: 0;
@@ -316,6 +315,7 @@
     border-width: 1px;
 }
 
+.mbsc-ios.mbsc-form .mbsc-form-group-inset .mbsc-form-group-title + .mbsc-control-ng .mbsc-control-w:before,
 .mbsc-ios.mbsc-form .mbsc-form-group-inset .mbsc-control-ng:first-child .mbsc-control-w:before,
 .mbsc-ios.mbsc-form .mbsc-form-group-inset .mbsc-control-ng:last-child .mbsc-control-w:after {
     border-width: 0;

diff --git a/src/less/themes/ios.frame.less b/src/less/themes/ios.frame.less
@@ -6,6 +6,10 @@
 .mbsc-ios.mbsc-fr-top .mbsc-fr-btn-cont,
 .mbsc-ios.mbsc-fr-bottom .mbsc-fr-btn-cont {
     background: #efefef;
+    padding-left: constant(safe-area-inset-left);
+    padding-left: env(safe-area-inset-left);
+    padding-right: constant(safe-area-inset-right);
+    padding-right: env(safe-area-inset-right);
 }
 
 .mbsc-ios .mbsc-fr-overlay {
@@ -57,7 +61,8 @@
     position: absolute;
     top: 0;
     left: 0;
-    width: 100%;
+    right: 0;
+    display: block;
     border-bottom: 1px solid #ccc;
 }