Merge branch 'develop'

acidb · Feb 19, 2015 · ee7d11e · ee7d11e
2 parents 06c4f43 + 3a85195
commit ee7d11e
Show file tree

Hide file tree

Showing 55 changed files with 760 additions and 472 deletions.
diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
     "name": "mobiscroll",
-    "version": "2.14.4",
+    "version": "2.15.0",
     "main": [
         "js/mobiscroll.core.js",
-        "js/mobiscroll.widget.js",
+        "js/mobiscroll.frame.js",
         "js/mobiscroll.scroller.js",
         "js/mobiscroll.util.datetime.js",
         "js/mobiscroll.datetimebase.js",
@@ -13,7 +13,7 @@
         "js/mobiscroll.treelist.js",
         "js/mobiscroll.image.js",
         "css/mobiscroll.animation.css",
-        "css/mobiscroll.widget.css",
+        "css/mobiscroll.frame.css",
         "css/mobiscroll.scroller.css"
     ],
     "description": "A wheel scroller control optimized for touchscreens to easily enter date/time. It can easily be customized to support any custom values.",

diff --git a/css/mobiscroll.widget.android-holo.css → css/mobiscroll.frame.android-holo.css b/css/mobiscroll.widget.android-holo.css → css/mobiscroll.frame.android-holo.css
@@ -1,7 +1,6 @@
 .mbsc-android-holo .dwwr {
     background: #292829;
     color: #fff;
-    -webkit-border-radius: .1875em;
     border-radius: .1875em;
     font-size: 16px;
 }
@@ -31,24 +30,20 @@
 }
 .mbsc-android-holo .dwbw:first-child .dwb {
     border: 0;
-    -webkit-border-radius: 0 0 0 .1875em;
     border-radius: 0 0 0 .1875em;
 }
 .mbsc-android-holo .dwbw:last-child .dwb {
-    -webkit-border-radius: 0 0 .1875em 0;
     border-radius: 0 0 .1875em 0;
 }
 .mbsc-android-holo .dw-rtl .dwbw .dwb {
     border: 0;
     border-right: 1px solid #424542;
 }
 .mbsc-android-holo .dw-rtl .dwbw:last-child .dwb {
-    -webkit-border-radius: 0 0 0 .1875em;
     border-radius: 0 0 0 .1875em;
 }
 .mbsc-android-holo .dw-rtl .dwbw:first-child .dwb {
     border: 0;
-    -webkit-border-radius: 0 0 .1875em 0;
     border-radius: 0 0 .1875em 0;
 }
 /* Top, bottom mode */
@@ -58,7 +53,6 @@
 .mbsc-android-holo.dw-liq .dwbw .dwb,
 .mbsc-android-holo.dw-top .dwbw .dwb,
 .mbsc-android-holo.dw-bottom .dwbw .dwb {
-    -webkit-border-radius: 0;
     border-radius: 0;
 }
 /* Bubble positioning */

diff --git a/css/mobiscroll.widget.android.css → css/mobiscroll.frame.android.css b/css/mobiscroll.widget.android.css → css/mobiscroll.frame.android.css
diff --git a/css/mobiscroll.widget.css → css/mobiscroll.frame.css b/css/mobiscroll.widget.css → css/mobiscroll.frame.css
@@ -161,6 +161,13 @@
 .dwbw .dwb:before {
     padding: .375em;
 }
+/* Widget content styling */
+.mbsc-wdg .dwcc {
+    padding: .5em 1em;
+    font-size: 14px;
+    text-align: left;
+    white-space: normal;
+}
 
 /* Default theme */
 .mbsc-mobiscroll .dwwr {

diff --git a/css/mobiscroll.widget.ios-classic.css → css/mobiscroll.frame.ios-classic.css b/css/mobiscroll.widget.ios-classic.css → css/mobiscroll.frame.ios-classic.css
@@ -67,7 +67,6 @@
     background: -webkit-linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
     background: -moz-linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
     background: linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
-    -webkit-border-radius: 5px;
     -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3);
     border-radius: 5px;
     box-shadow: 0 1px 0 rgba(255,255,255,0.3);
@@ -99,7 +98,6 @@
     background: -webkit-linear-gradient(#afafaf, #1b2530 30%);
     background: -moz-linear-gradient(#afafaf, #1b2530 30%);
     background: linear-gradient(#afafaf, #1b2530 30%);
-    -webkit-border-radius: 5px;
     -webkit-box-shadow: 0 0 25px rgba(0,0,0,0.7);
     border-radius: 5px;
     box-shadow: 0 0 25px rgba(0,0,0,0.7);
@@ -118,3 +116,14 @@
 .mbsc-ios-classic .dw-bubble-top .dw-arr {
     border-color: #1b2530 transparent transparent transparent;
 }
+/* Widget */
+.mbsc-ios-classic.mbsc-wdg .dwwr {
+    padding: 6px;
+}
+.mbsc-ios-classic.mbsc-wdg .dwcc {
+    background: #fff;
+    color: #000;
+    -webkit-box-shadow: 0 1px 1px rgba(255,255,255,.3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
+    box-shadow: 0 1px 1px rgba(255,255,255,.3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
+    border-radius: .5em;
+}
diff --git a/css/mobiscroll.widget.ios.css → css/mobiscroll.frame.ios.css b/css/mobiscroll.widget.ios.css → css/mobiscroll.frame.ios.css
@@ -52,7 +52,6 @@
     border-color: #f7f7f7 transparent transparent transparent;
 }
 .mbsc-ios.dw-bubble .dwwr {
-    -webkit-border-radius: 8px;
     border-radius: 8px;
 }
 /* Inline display */

diff --git a/css/mobiscroll.widget.jqm.css → css/mobiscroll.frame.jqm.css b/css/mobiscroll.widget.jqm.css → css/mobiscroll.frame.jqm.css
@@ -45,7 +45,6 @@
 .mbsc-jqm.dw-top .dwwr,
 .mbsc-jqm.dw-bottom .dwwr {
     padding: 0;
-    -webkit-border-radius: 0;
     border-radius: 0;
 }
 .mbsc-jqm.dw-top .dw {

diff --git a/css/mobiscroll.widget.sense-ui.css → css/mobiscroll.frame.sense-ui.css b/css/mobiscroll.widget.sense-ui.css → css/mobiscroll.frame.sense-ui.css
@@ -2,7 +2,6 @@
     color: #fff;
     background: #333;
     border: 2px solid #fff;
-    -webkit-border-radius: 3px;
     border-radius: 3px;
 }
 .mbsc-sense-ui .dwv {
@@ -36,7 +35,6 @@
     background: -moz-linear-gradient(#444,#000);
     background: linear-gradient(#444,#000);
     box-shadow: inset 0 0 5px #000;
-    -webkit-border-radius: 5px;
     border-radius: 5px;
 }
 .mbsc-sense-ui .dw .dwb-a {
@@ -57,7 +55,6 @@
 .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 {

diff --git a/css/mobiscroll.widget.wp.css → css/mobiscroll.frame.wp.css b/css/mobiscroll.widget.wp.css → css/mobiscroll.frame.wp.css
@@ -49,7 +49,6 @@
     line-height: 2.2em;
     font-size: .909em;
     text-align: center;
-    -webkit-border-radius: 1000px;
     border-radius: 1000px;
 }
 .mbsc-wp .dwb-a {

diff --git a/css/mobiscroll.scroller.android.css b/css/mobiscroll.scroller.android.css
@@ -52,7 +52,6 @@
 .mbsc-android .dwpm .dww {
     color: #000;
     background: #fff;
-    -webkit-border-radius: 3px;
     border-radius: 3px;
 }
 .mbsc-android .dwpm .dw-li {
@@ -70,7 +69,6 @@
     background: -webkit-linear-gradient(#f7f7f7,#bdbdbd);
     background: -moz-linear-gradient(#f7f7f7,#bdbdbd);
     background: linear-gradient(#f7f7f7,#bdbdbd);
-    -webkit-border-radius: 3px 3px 0 0;
     border-radius: 3px 3px 0 0;
     font-size: 40px;
 }
@@ -79,7 +77,6 @@
     background: -webkit-linear-gradient(#bdbdbd,#f7f7f7);
     background: -moz-linear-gradient(#bdbdbd,#f7f7f7);
     background: linear-gradient(#bdbdbd,#f7f7f7);
-    -webkit-border-radius: 0 0 3px 3px;
     border-radius: 0 0 3px 3px;
     font-size: 32px;
     font-weight: bold;

diff --git a/css/mobiscroll.scroller.css b/css/mobiscroll.scroller.css
@@ -79,7 +79,8 @@
     filter: Alpha(Opacity=30);
 }
 /* Valid entry */
-.dw-li.dw-v {
+.dw-li.dw-v,
+.dw-li.dw-fv {
     opacity: 1;
     filter: Alpha(Opacity=100);
 }

diff --git a/css/mobiscroll.scroller.ios-classic.css b/css/mobiscroll.scroller.ios-classic.css
@@ -36,13 +36,11 @@
     background: -webkit-linear-gradient(#333,#999 10%,#fff 30%,#fff 70%,#999 90%,#333);
     background: -moz-linear-gradient(#333,#999 10%,#fff 30%,#fff 70%,#999 90%,#333);
     background: linear-gradient(#333,#999 10%,#fff 30%,#fff 70%,#999 90%,#333);
-    -webkit-border-radius: 0;
     border-radius: 0;
 }
 .mbsc-ios-classic .dwpm .dwwl {
     margin: 4px 2px;
     border: 1px solid #000;
-    -webkit-border-radius: 3px;
     border-radius: 3px;
 }
 .mbsc-ios-classic .dwpm .dww {
@@ -97,12 +95,10 @@
     background: linear-gradient(#c7d1e2,#808ea6 50%,#75859f 50%,#3f4e68);
 }
 .mbsc-ios-classic .dwwbp {
-    -webkit-border-radius: 3px 3px 0 0;
     border-radius: 3px 3px 0 0;
     font-size: 40px;
 }
 .mbsc-ios-classic .dwwbm {
-    -webkit-border-radius: 0 0 3px 3px;
     border-radius: 0 0 3px 3px;
     font-size: 32px;
     font-weight: bold;

diff --git a/css/mobiscroll.scroller.jqm.css b/css/mobiscroll.scroller.jqm.css
@@ -14,7 +14,6 @@
     padding: 4px 2px 1px 2px;
 }
 .mbsc-jqm .dwwl {
-    -webkit-border-radius: 4px;
     border-radius: 4px;
 }
 .mbsc-jqm14 .dwwl {
@@ -57,11 +56,9 @@
     margin-top: -1px;
 }
 .mbsc-jqm .dwwbp {
-    -webkit-border-radius: 4px 4px 0 0;
     border-radius: 4px 4px 0 0;
 }
 .mbsc-jqm .dwwbm {
-    -webkit-border-radius: 0 0 4px 4px;
     border-radius: 0 0 4px 4px;
 }
 .mbsc-jqm .dwwbp span {

diff --git a/css/mobiscroll.scroller.sense-ui.css b/css/mobiscroll.scroller.sense-ui.css
@@ -24,7 +24,6 @@
     background: -webkit-linear-gradient(#000,#333 35%, #888 50%,#333 65%,#000);
     background: -moz-linear-gradient(#000,#333 35%, #888 50%,#333 65%,#000);
     background: linear-gradient(#000,#333 35%, #888 50%,#333 65%,#000);
-    -webkit-border-radius: 3px;
     border-radius: 3px;
 }
 .mbsc-sense-ui .dww {
@@ -55,7 +54,6 @@
 .mbsc-sense-ui .dwpm .dww {
     color: #000;
     background: #fff;
-    -webkit-border-radius: 3px;
     border-radius: 3px;
 }
 .mbsc-sense-ui .dwpm .dw-li {
@@ -73,7 +71,6 @@
     background: -webkit-linear-gradient(#f7f7f7,#bdbdbd);
     background: -moz-linear-gradient(#f7f7f7,#bdbdbd);
     background: linear-gradient(#f7f7f7,#bdbdbd);
-    -webkit-border-radius: 3px 3px 0 0;
     border-radius: 3px 3px 0 0;
     font-size: 40px;
 }
@@ -82,7 +79,6 @@
     background: -webkit-linear-gradient(#bdbdbd,#f7f7f7);
     background: -moz-linear-gradient(#bdbdbd,#f7f7f7);
     background: linear-gradient(#bdbdbd,#f7f7f7);
-    -webkit-border-radius: 0 0 3px 3px;
     border-radius: 0 0 3px 3px;
     font-size: 32px;
     font-weight: bold;

diff --git a/css/mobiscroll.scroller.wp.css b/css/mobiscroll.scroller.wp.css
@@ -49,7 +49,9 @@
     filter: Alpha(Opacity=30);
 }
 .mbsc-wp .wpa .dw-v, 
-.mbsc-wp .dwa .dw-v { 
+.mbsc-wp .wpa .dw-fv,
+.mbsc-wp .dwa .dw-v,
+.mbsc-wp .dwa .dw-fv { 
     opacity: 1;
     filter: Alpha(Opacity=100);
 }
@@ -94,7 +96,6 @@
     font-size: .688em;
     text-align: center;
     border: 2px solid #fff;
-    -webkit-border-radius: 1.182em;
     border-radius: 1.182em;
 }
 .mbsc-wp .dwwl .dwb-a {
@@ -121,6 +122,7 @@
     color: #fff;
     border: 0;
     padding-left: 1.538em;
+    background: none;
 }
 .mbsc-wp .dwwms .dw-li:after {
     content: '';
@@ -144,10 +146,7 @@
     color: #fff;
 }
 /* Group select */
-.mbsc-wp .dw-select-gr .dw-li .dw-i {
-    padding-left: 40px;
-}
-.mbsc-wp .dw-select-gr .dw-w-gr {
+.mbsc-wp .dw-select-gr.wpa .dw-w-gr {
     font-size: 22px;
     font-weight: normal;
     opacity: 1;
@@ -161,37 +160,5 @@
     display: none;
 }
 
-/* Accents */
-.mbsc-wp-lime .dw-sel .dw-i, .mbsc-wp-lime .dw-ul .dw-hl .dw-i { background: #a4c400; border-color: #a4c400; }
-.mbsc-wp-green .dw-sel .dw-i, .mbsc-wp-green .dw-ul .dw-hl .dw-i { background: #60a917; border-color: #60a917; }
-.mbsc-wp-emerald .dw-sel .dw-i, .mbsc-wp-emerald .dw-ul .dw-hl .dw-i { background: #008a00; border-color: #008a00; }
-.mbsc-wp-teal .dw-sel .dw-i, .mbsc-wp-teal .dw-ul .dw-hl .dw-i { background: #00aba9; border-color: #00aba9; }
-.mbsc-wp-cyan .dw-sel .dw-i, .mbsc-wp-cyan .dw-ul .dw-hl .dw-i { background: #1ba1e2; border-color: #1ba1e2; }
-.mbsc-wp-cobalt .dw-sel .dw-i, .mbsc-wp-cobalt .dw-ul .dw-hl .dw-i { background: #0050ef; border-color: #0050ef; }
-.mbsc-wp-indigo .dw-sel .dw-i, .mbsc-wp-indigo .dw-ul .dw-hl .dw-i { background: #6a00ff; border-color: #6a00ff; }
-.mbsc-wp-violet .dw-sel .dw-i, .mbsc-wp-violet .dw-ul .dw-hl .dw-i { background: #aa00ff; border-color: #aa00ff; }
-.mbsc-wp-pink .dw-sel .dw-i, .mbsc-wp-pink .dw-ul .dw-hl .dw-i { background: #f472d0; border-color: #f472d0; }
-.mbsc-wp-magenta .dw-sel .dw-i, .mbsc-wp-magenta .dw-ul .dw-hl .dw-i { background: #d80073; border-color: #d80073; }
-.mbsc-wp-crimson .dw-sel .dw-i, .mbsc-wp-crimson .dw-ul .dw-hl .dw-i { background: #a20025; border-color: #a20025; }
-.mbsc-wp-red .dw-sel .dw-i, .mbsc-wp-red .dw-ul .dw-hl .dw-i { background: #e51400; border-color: #e51400; }
-.mbsc-wp-orange .dw-sel .dw-i, .mbsc-wp-orange .dw-ul .dw-hl .dw-i { background: #fa6800; border-color: #fa6800; }
-.mbsc-wp-amber .dw-sel .dw-i, .mbsc-wp-amber .dw-ul .dw-hl .dw-i { background: #f0a30a; border-color: #f0a30a; }
-.mbsc-wp-yellow .dw-sel .dw-i, .mbsc-wp-yellow .dw-ul .dw-hl .dw-i { background: #d8c100; border-color: #d8c100; }
-.mbsc-wp-brown .dw-sel .dw-i, .mbsc-wp-brown .dw-ul .dw-hl .dw-i { background: #825a2c; border-color: #825a2c; }
-.mbsc-wp-olive .dw-sel .dw-i, .mbsc-wp-olive .dw-ul .dw-hl .dw-i { background: #6d8764; border-color: #6d8764; }
-.mbsc-wp-steel .dw-sel .dw-i, .mbsc-wp-steel .dw-ul .dw-hl .dw-i { background: #647687; border-color: #647687; }
-.mbsc-wp-mauve .dw-sel .dw-i, .mbsc-wp-mauve .dw-ul .dw-hl .dw-i { background: #76608a; border-color: #76608a; }
-.mbsc-wp-sienna .dw-sel .dw-i, .mbsc-wp-sienna .dw-ul .dw-hl .dw-i { background: #7a3b3f; border-color: #7a3b3f; }
-
-/* Override accents */
-.mbsc-wp .dwa .dw-i {
-    color: #fff;
-    border-color: #4c4c4c;
-    background: none;
-}
-
-.mbsc-wp .dwwms .dw-i {
-    background: none;
-}
 
 
diff --git a/css/mobiscroll.wp-light.css b/css/mobiscroll.wp-light.css
@@ -68,7 +68,10 @@
 .mbsc-wp-light .dw-cal-day-m {
     border-color: rgb(0,0,0) rgb(0,0,0) transparent transparent;
 }
-.mbsc-wp-light .dw-cal-day-hl .dw-i {
+.mbsc-wp-light .dw-cal-day-fg {
+    border-color: rgb(166,166,166);
+}
+.mbsc-wp-light .dw-cal-day-hl .dw-cal-day-fg {
     background: rgb(0,0,0);
     border-color: rgb(0,0,0);
     color: rgb(222,222,222);