Merge branch 'develop'

acidb · Dec 17, 2014 · 598cd66 · 598cd66
2 parents 10928f6 + 583cb58
commit 598cd66
Show file tree

Hide file tree

Showing 29 changed files with 347 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,58 @@ 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.3
+================
+
+_Integrations_
+
+  * New: `mobiscroll-data` attribute added to Angular listview integration for filter support (#264).
+
+  * New: `mobiscroll-instance` attribute added to Angular directives for better accessibility (#266).
+
+  * New: Added menustrip helper to ASP.NET MVC integration.
+
+  * Fixed: Kendo `mobiscroll-color` and `mobiscroll-range` bindings were not working (#268).
+
+  * Fixed: Group select was not working with Angular, if generated with `ng-repeat`.
+
+_Datetime_
+
+  * New: `steps` setting instead of `stepHour`, `stepMinute`, `stepSecond`, also allows starting steps from 0 (#263).
+
+_Calendar_
+
+  * Fixed: Marked icon was not visible, if had color and text specified.
+
+_Listview_
+
+  * New: `enhance` setting to automatically add styling to list items.
+
+  * New: `rtl` setting for right to left support.
+
+  * Fixed: Listview fixed header was not removed on destroy, if context was specified.
+
+_Measurements_
+
+  * Fixed: Disable whole value, if all fractions are disabled.
+
+_Menustrip_
+
+  * New: `navigate`, `prev` and `next` methods for programatic navigation.
+
+_Number_
+
+  * Fixed: Disable whole value, if all fractions are disabled.
+
+_Scroller_
+
+  * Fixed: Detach keydown event handler from window on hide.
+
+_Themes_
+
+  * Fixed: Widget header disappeared if header text was empty. 
+
+
 Changelog 2.14.2
 ================
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll",
-    "version": "2.14.2",
+    "version": "2.14.3",
     "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
@@ -127,10 +127,6 @@
     background: rgb(49,183,232);
     color: #fff;
 }
-/* Colorpicker */
-.mbsc-android-holo-light .dw-color-preview {
-    border-bottom: 2px solid rgb(49,183,232);
-}
 /* Timer */
 .mbsc-android-holo-light.dw-timer .dwl {
     color: rgb(49,183,232);

diff --git a/css/mobiscroll.mobiscroll-dark.css b/css/mobiscroll.mobiscroll-dark.css
@@ -0,0 +1,200 @@
+/* Higlighted */
+.mbsc-mobiscroll-dark .dwwr {
+    background: rgb(38,50,56); /*background*/
+    color: rgb(247,247,247);  /*text*/
+}
+.mbsc-mobiscroll-dark .dwv,
+.mbsc-mobiscroll-dark .dwl {
+    color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dwwol {
+    border-color: rgb(79,204,196); /*accent*/
+}
+.mbsc-mobiscroll-dark .dwb-a {
+    background: rgba(79,204,196, 0.3);
+}
+.mbsc-mobiscroll-dark .dw-hl {
+    background: rgba(79,204,196, 0.3);
+}
+.mbsc-mobiscroll-dark .dwb {
+    color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dwwb {
+    color: rgb(79,204,196);
+    background: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dwwb.dwb-a:before {
+    background: rgba(79,204,196,0.3);
+}
+.mbsc-mobiscroll-dark .dw-bubble-bottom .dw-arr {
+    border-color: transparent transparent rgb(38,50,56) transparent;
+}
+.mbsc-mobiscroll-dark .dw-bubble-top .dw-arr {
+    border-color: rgb(38,50,56) transparent transparent transparent;
+}
+.mbsc-mobiscroll-dark .dw-msel:before {
+    color: rgb(79,204,196);
+}
+/* Calendar */
+.mbsc-mobiscroll-dark  .dw-cal .dw-sel .dw-i {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark  .dw-cal-days {
+    color: rgb(79,204,196);
+    border-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark  .dw-cal-btn-txt {
+    color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-cal-event-color {
+    background: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-cal-events {
+    color: rgb(38,50,56);
+    background: rgb(255,255,255);
+}
+.mbsc-mobiscroll-dark .dw-cal-events-arr {
+    border-color: rgb(255,255,255) transparent transparent transparent;
+}
+.mbsc-mobiscroll-dark .dw-cal-events-b .dw-cal-events-arr {
+    border-color: transparent transparent rgb(255,255,255) transparent;
+}
+.mbsc-mobiscroll-dark .dw-cal-event-time {
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dw-cal-event-dur {
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dw-cal-day-hl .dw-i {
+    border-color: rgb(79,204,196); 
+}
+.mbsc-mobiscroll-dark .dw-week-nrs-c {
+    color: rgb(79,204,196);
+    background: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dw-cal-day-m {
+    background: rgb(247,247,247); 
+}
+.mbsc-mobiscroll-dark .dw-sel .dw-cal-day-m {
+    background: rgb(38,50,56); 
+}
+.mbsc-mobiscroll-dark .dw-cal-day-m-c {
+    background: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-sel .dw-cal-day-m-c {
+    background: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dw-cal-day-txt {
+    color: rgb(38,50,56);
+    background: rgb(247,247,247);
+}
+.mbsc-mobiscroll-dark .dw-cal-tab {
+    border-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-cal-tab .dw-i {
+    color: rgb(247,247,247);
+}
+.mbsc-mobiscroll-dark .dw-cal-tabs .dw-sel {
+    background: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-cal-tabs .dw-sel .dw-i {
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .dw-cal-sc-c {
+    background: rgb(38,50,56);
+}
+/* Rangepicker */
+.mbsc-mobiscroll-dark .dw-dr {
+    border-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .dw-sel .dw-dr {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark.dw-range .dw-cal-table .dw-sel .dw-i {
+    color: rgb(247,247,247);
+    background: rgba(79,204,196, 0.3);
+}
+.mbsc-mobiscroll-dark.dw-range .dw-cal-table .dw-cal-day-hl .dw-i {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+
+/* Rating */
+.mbsc-mobiscroll-dark .mbsc-rating-icon {
+    color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark .mbsc-rating-icon-unf {
+    color: rgba(79,204,196, 0.3);
+}
+.mbsc-mobiscroll-dark .mbsc-rating-circle {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .mbsc-rating-circle-unf {
+    background: none;
+    border-color: rgb(79,204,196);
+}
+/* Numpad */
+.mbsc-mobiscroll-dark .mbsc-np-del {
+    color: rgb(79,204,196);
+}
+/* Colorpicker */
+.mbsc-mobiscroll-dark .dw-color {
+    border-color: rgb(38,50,56);
+}
+/* Listview */
+.mbsc-lv-mobiscroll-dark .mbsc-lv-item {
+    background: rgb(38,50,56);
+    color: rgb(247,247,247);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-gr-title {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-arr {
+    color: rgb(79,204,196);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-handle-bar {
+    background: rgb(79,204,196);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-item-active::after {
+    background: rgba(79,204,196, 0.3);
+}
+.mbsc-lv-mobiscroll-dark.mbsc-lv-alt-row .mbsc-lv-item:nth-child(even) {
+    background: rgb(29,38,43);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-item.mbsc-lv-item-dragging {
+    background: rgb(79,204,196);
+    color: rgb(38,50,56);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-item-dragging .mbsc-lv-handle-bar {
+    background: rgb(38,50,56);
+}
+.mbsc-lv-mobiscroll-dark .mbsc-lv-item-dragging .mbsc-lv-arr {
+    color: rgb(38,50,56);
+}
+/* Menustrip */
+.mbsc-mobiscroll-dark.mbsc-ms-c {
+    color: rgb(247,247,247);
+    background: rgb(38,50,56);
+}
+.mbsc-mobiscroll-dark .mbsc-btn-a .mbsc-ms-item-i {
+    background: rgba(79,204,196,.3);
+}
+.mbsc-mobiscroll-dark.mbsc-ms-a .mbsc-ms-item-sel .mbsc-ms-item-i {
+    color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark.mbsc-ms-b.mbsc-ms-top {
+    border-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark.mbsc-ms-b.mbsc-ms-bottom {
+    border-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark.mbsc-ms-b .mbsc-ms-item-sel .mbsc-ms-item-i {
+    border-bottom-color: rgb(79,204,196);
+}
+.mbsc-mobiscroll-dark.mbsc-ms-b.mbsc-ms-bottom .mbsc-ms-item-sel .mbsc-ms-item-i {
+    border-top-color: rgb(79,204,196);
+}
diff --git a/css/mobiscroll.scroller.android-holo.css b/css/mobiscroll.scroller.android-holo.css
@@ -2,6 +2,9 @@
 .mbsc-android-holo .dwc {
     padding: 1.875em .625em .063em .625em;
 }
+.mbsc-android-holo .dwl {
+    font-size: .75em;
+}
 .mbsc-android-holo .dwhl {
     padding: .0625em .625em;
 }

diff --git a/css/mobiscroll.scroller.wp.css b/css/mobiscroll.scroller.wp.css
@@ -5,6 +5,9 @@
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
+.mbsc-wp .dwl {
+    font-size: .75em;
+}
 .mbsc-wp .dwc {
     padding: 1.875em 0 0 0;
 }

diff --git a/css/mobiscroll.widget.android-holo.css b/css/mobiscroll.widget.android-holo.css
@@ -7,6 +7,7 @@
 }
 .mbsc-android-holo .dwv {
     color: #31b6e7;
+    min-height: 2em;
     line-height: 2em;
     border-bottom: 2px solid #31b6e7;
     font-size: 1.125em;

diff --git a/css/mobiscroll.widget.android.css b/css/mobiscroll.widget.android.css
@@ -6,6 +6,7 @@
     padding: 10px;
     border-bottom: 1px solid #333;
     font-size: 14px;
+    min-height: 17px;
 }
 .mbsc-android .dwwr {
     color: #fff;

diff --git a/css/mobiscroll.widget.css b/css/mobiscroll.widget.css
@@ -169,6 +169,7 @@
     color: #4eccc4;
     font-size: .75em;
     text-transform: uppercase;
+    min-height: 2em;
     line-height: 2em;
 }
 .mbsc-mobiscroll .dwbc {

diff --git a/css/mobiscroll.widget.ios.css b/css/mobiscroll.widget.ios.css
@@ -11,6 +11,7 @@
 .mbsc-ios .dwv {
     color: #9d9d9d;
     line-height: 30px;
+    min-height: 30px;
     font-size: 12px;
     border-bottom: 1px solid #acacac;
 }

diff --git a/css/mobiscroll.widget.jqm.css b/css/mobiscroll.widget.jqm.css
@@ -7,6 +7,7 @@
     border: 0;
     padding: 5px 0;
     font-size: 14px;
+    min-height: 18px;
 }
 .mbsc-jqm .dwwr {
     border: 0;

diff --git a/css/mobiscroll.widget.sense-ui.css b/css/mobiscroll.widget.sense-ui.css
@@ -10,6 +10,7 @@
     border-bottom: 1px solid #666;
     font-size: 14px;
     text-align: left;
+    min-height: 17px;
 }
 /* Buttons */
 .mbsc-sense-ui .dwbc {

diff --git a/css/mobiscroll.widget.wp.css b/css/mobiscroll.widget.wp.css
@@ -7,6 +7,7 @@
 .mbsc-wp .dwv {
     font-size: .75em;
     padding: .833em;
+    min-height: 14px;
     padding-top: 0;
 }
 .mbsc-wp .dwbc {

diff --git a/index-appframework.html b/index-appframework.html
@@ -34,6 +34,7 @@
 
     <script src="js/mobiscroll.android-holo-light.js"></script>
     <script src="js/mobiscroll.wp-light.js"></script>
+    <script src="js/mobiscroll.mobiscroll-dark.js"></script>
 
     <script src="js/i18n/mobiscroll.i18n.cs.js"></script>
     <script src="js/i18n/mobiscroll.i18n.de.js"></script>
@@ -79,6 +80,7 @@
 
     <link href="css/mobiscroll.android-holo-light.css" rel="stylesheet" type="text/css" />
     <link href="css/mobiscroll.wp-light.css" rel="stylesheet" type="text/css" />
+    <link href="css/mobiscroll.mobiscroll-dark.css" rel="stylesheet" type="text/css" />
 
     <style type="text/css">
         /* Demo Page styling, you can disregard this in your implementation */
@@ -185,6 +187,7 @@ <h1>Mobiscroll</h1>
             <label for="theme">Theme</label>
             <select name="theme" id="theme" class="settings">
                 <option value="">Mobiscroll</option>
+                <option value="mobiscroll-dark">Mobiscroll</option>
                 <option value="android">Android</option>
                 <option value="android-holo">Android Holo</option>
                 <option value="android-holo-light">Android Holo Light</option>