Merge commit '67b43975c0528b294fb81d2069c85971c1aa712d'

Conflicts: bower.json
acidb · Nov 26, 2014 · 55c93a7 · 55c93a7
2 parents ed27d37 + 67b4397
commit 55c93a7
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,42 @@ It'd be cool to see how you're using Mobiscroll!
 We're looking at showcasing some of the best work on http://mobiscroll.com . Feel free to let us know on twitter @mobiscroll!
 
 
+Changelog 2.14.1
+================
+
+_Auto Theme_
+
+  * Fixed: Did not load iOS Classic theme on iOS < 7.
+
+_Calendar_
+
+  * Fixed: setVal was not working correctly with multiple select if date objects had time (other than 00:00) (#258).
+
+_Image_
+
+  * Fixed: `enhance` setting did not work with App Framework.
+
+  * Fixed: `labels` setting did not work properly.
+
+_Range_
+
+  * Fixed: Stopped working if `onClose` returned false.
+
+  * Fixed: `defaultValue` did not work correctly with empty array.
+
+_Themes_
+
+  * Fixed: Bubble arrow was dark for Android Holo Light.
+
+  * Fixed: Bubble arrow was dark for Windows Phone Light.
+
+_Treelist_
+
+  * Fixed: `enhance` setting did not work with App Framework.
+
+  * Fixed: `labels` setting did not work properly.
+
+
 Changelog 2.14.0
 ================
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll",
-    "version": "2.14.0",
+    "version": "2.14.1",
     "main": [
         "js/mobiscroll.core.js",
         "js/mobiscroll.widget.js",

diff --git a/css/mobiscroll.android-holo-light.css b/css/mobiscroll.android-holo-light.css
@@ -50,6 +50,13 @@
 .mbsc-android-holo-light .dwbw .dwb  { 
     border-color: rgb(217,213,217);
 }
+/* Bubble positioning */
+.mbsc-android-holo-light .dw-bubble-bottom .dw-arr {
+    border-color: transparent transparent rgb(245,245,245) transparent;
+}
+.mbsc-android-holo-light .dw-bubble-top .dw-arr {
+    border-color: rgb(245,245,245) transparent transparent transparent;
+}
 /* Calendar */
 .mbsc-android-holo-light .dw-cal-day-m {
     border-color: rgb(49,183,232) rgb(49,183,232) transparent transparent;

diff --git a/css/mobiscroll.scroller.sense-ui.css b/css/mobiscroll.scroller.sense-ui.css
@@ -2,7 +2,7 @@
     padding: 30px 2px 4px 2px;
 }
 .mbsc-sense-ui .dwhl {
-    padding-top: 0;
+    padding-top: 4px;
 }
 .mbsc-sense-ui .dwfl {
     padding: 0 2px;

diff --git a/css/mobiscroll.widget.sense-ui.css b/css/mobiscroll.widget.sense-ui.css
@@ -53,10 +53,12 @@
     border-color: #fff transparent transparent transparent;
 }
 /* Docked */
-.mbsc-sense-ui.dw-top .dwwr {
+.mbsc-sense-ui.dw-top .dwwr,
+.mbsc-sense-ui.dw-bottom .dwwr {
     border: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
 }
 .mbsc-sense-ui.dw-bottom .dwwr {
-    border: 0;
     border-top: 1px solid #666;
 }
diff --git a/css/mobiscroll.wp-light.css b/css/mobiscroll.wp-light.css
@@ -19,6 +19,13 @@
     background: rgb(181,181,181);
     border-color: rgb(181,181,181);
 }
+/* Bubble positioning */
+.mbsc-wp-light .dw-bubble-bottom .dw-arr {
+    border-color: transparent transparent rgb(222,222,222) transparent;
+}
+.mbsc-wp-light .dw-bubble-top .dw-arr {
+    border-color: rgb(222,222,222) transparent transparent transparent;
+}
 /* Multiple select */
 .mbsc-wp-light .dwwms .dw-li .dw-i {
     color: rgb(0,0,0);

diff --git a/js/mobiscroll.appframework.js b/js/mobiscroll.appframework.js
@@ -235,6 +235,11 @@ if (!window.jQuery) {
             return this;
         };
 
+        $.fn.insertAfter = function (elm) {
+            this.insertBefore(elm, true);
+            return this;
+        };
+
         $.fn.pluck = function (property) {
             return this.map(function (i, e) { return e[property]; });
         };

diff --git a/js/mobiscroll.core.js b/js/mobiscroll.core.js
@@ -1,5 +1,5 @@
 /*!
- * Mobiscroll v2.14.0
+ * Mobiscroll v2.14.1
  * http://mobiscroll.com
  *
  * Copyright 2010-2014, Acid Media
@@ -80,7 +80,7 @@
     };
 
     $.mobiscroll = $.mobiscroll || {
-        version: '2.14.0',
+        version: '2.14.1',
         util: {
             prefix: prefix,
             jsPrefix: pr,

diff --git a/js/mobiscroll.listbase.js b/js/mobiscroll.listbase.js
@@ -19,10 +19,10 @@
             lvl = 0,
             ilvl = 0,
             timer = {},
-            labels = generateLabels(lvl),
             currLevel = 1,
             currWheelVector = [],
             wa = s.wheelArray || createWheelArray(elm),
+            labels = generateLabels(lvl),
             fwv = firstWheelVector(wa),
             w = generateWheelsFromVector(fwv, lvl);
 

diff --git a/js/mobiscroll.scroller.js b/js/mobiscroll.scroller.js
@@ -364,6 +364,8 @@
                     }
                 });
 
+                trigger('onValidated', []);
+
                 // Reformat value if validation changed something
                 that._tempValue = s.formatResult(that._tempWheelArray);
 
@@ -377,8 +379,6 @@
                 if (manual) {
                     trigger('onChange', [that._tempValue]);
                 }
-
-                trigger('onValidated', []);
             }
 
         }

diff --git a/mobiscroll.datetime.jquery.json b/mobiscroll.datetime.jquery.json
@@ -14,7 +14,7 @@
     "scroller",
     "clickpick"
   ],
-  "version": "2.14.0",
+  "version": "2.14.1",
   "author": {
     "name": "Acid Media",
     "url": "http://theacidmedia.net"

diff --git a/mobiscroll.imageandtext.jquery.json b/mobiscroll.imageandtext.jquery.json
@@ -13,7 +13,7 @@
     "scroller",
     "clickpick"
   ],
-  "version": "2.14.0",
+  "version": "2.14.1",
   "author": {
     "name": "Acid Media",
     "url": "http://theacidmedia.net"

diff --git a/mobiscroll.select.jquery.json b/mobiscroll.select.jquery.json
@@ -14,7 +14,7 @@
     "scroller",
     "clickpick"
   ],
-  "version": "2.14.0",
+  "version": "2.14.1",
   "author": {
     "name": "Acid Media",
     "url": "http://theacidmedia.net"

diff --git a/mobiscroll.treelist.jquery.json b/mobiscroll.treelist.jquery.json
@@ -13,7 +13,7 @@
     "scroller",
     "clickpick"
   ],
-  "version": "2.14.0",
+  "version": "2.14.1",
   "author": {
     "name": "Acid Media",
     "url": "http://theacidmedia.net"