Merge branch 'develop'

acidb · Apr 20, 2016 · 396f6cd · 396f6cd
2 parents e4038e7 + 9b5c405
commit 396f6cd
Show file tree

Hide file tree

Showing 14 changed files with 153 additions and 70 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "mobiscroll",
-    "version": "2.17.1",
+    "version": "2.17.2",
     "main": [
         "js/mobiscroll.core.js",
         "js/mobiscroll.frame.js",

diff --git a/css/mobiscroll.frame.css b/css/mobiscroll.frame.css
@@ -51,6 +51,9 @@
     overflow: hidden;
     text-align: center;
     font-family: arial, verdana, sans-serif;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
 }
 /* Modal overlay */
 

diff --git a/css/mobiscroll.scroller.css b/css/mobiscroll.scroller.css
@@ -168,6 +168,9 @@
     left: 0;
     width: 100%;
     pointer-events: none;
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
 }
 /* Liquid mode */
 

diff --git a/js/i18n/mobiscroll.i18n.da.js b/js/i18n/mobiscroll.i18n.da.js
@@ -0,0 +1,61 @@
+// Dansk
+/*
+ * Translation by: Mikkel Bonde, Apacta A/S <[email protected]>
+ */
+(function ($) {
+    $.mobiscroll.i18n.da = {
+        // Core
+        setText: 'Sæt',
+        cancelText: 'Annuller',
+        clearText: 'Ryd',
+        selectedText: '{count} valgt',
+        selectedPluralText: '{count} valgt',
+        // Datetime component
+        dateFormat: 'dd/mm/yy',
+        dateOrder: 'ddmmyy',
+        dayNames: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
+        dayNamesShort: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
+        dayNamesMin: ['S', 'M', 'T', 'O', 'T', 'F', 'L'],
+        dayText: 'Dag',
+        hourText: 'Timer',
+        minuteText: 'Minutter',
+        monthNames: ['Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December'],
+        monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'],
+        monthText: 'Måned',
+        secText: 'Sekunder',
+        amText: 'am',
+        pmText: 'pm',
+        timeFormat: 'HH:ii',
+        timeWheels: 'HHii',
+        yearText: 'År',
+        nowText: 'Nu',
+        // Calendar component
+        firstDay: 1,
+        dateText: 'Dato',
+        timeText: 'Tid',
+        calendarText: 'Kalender',
+        closeText: 'Luk',
+        // Daterange component
+        fromText: 'Start',
+        toText: 'Slut',
+        // Measurement components
+        wholeText: 'Hele',
+        fractionText: 'Dele',
+        unitText: 'Enhed',
+        // Time / Timespan component
+        labels: ['År', 'Måneder', 'Dage', 'Timer', 'Minutter', 'Sekunder', ''],
+        labelsShort: ['År', 'Mdr', 'Dg', 'Timer', 'Min', 'Sek', ''],
+        // Timer component
+        startText: 'Start',
+        stopText: 'Stop',
+        resetText: 'Nulstil',
+        lapText: 'Omgang',
+        hideText: 'Skjul',
+        // Forms
+        offText: 'Fra',
+        onText: 'Til',
+        // Listview
+        backText: 'Tilbage',
+        undoText: 'Fortryd'
+    };
+})(jQuery);
diff --git a/js/mobiscroll.core.js b/js/mobiscroll.core.js
@@ -1,5 +1,5 @@
 /*!
- * Mobiscroll v2.17.1
+ * Mobiscroll v2.17.2
  * http://mobiscroll.com
  *
  * Copyright 2010-2015, Acid Media
@@ -78,7 +78,7 @@
     };
 
     ms = $.mobiscroll = $.mobiscroll || {
-        version: '2.17.1',
+        version: '2.17.2',
         util: {
             prefix: prefix,
             jsPrefix: pr,
@@ -174,7 +174,9 @@
                     } else {
                         icons[align] = icon;
                     }
+                }
 
+                if (icon || ic) {
                     extend(icons, ic);
 
                     $parent
@@ -306,12 +308,14 @@
         };
 
         that._destroy = function () {
-            that.trigger('onDestroy', []);
+            if (that) {
+                that.trigger('onDestroy', []);
 
-            // Delete scroller instance
-            delete instances[el.id];
+                // Delete scroller instance
+                delete instances[el.id];
 
-            that = null;
+                that = null;
+            }
         };
 
         /**
@@ -333,12 +337,6 @@
                     startX = getCoord(ev, 'X');
                     startY = getCoord(ev, 'Y');
                     moved = false;
-
-                    if (ev.type == 'pointerdown') {
-                        $(document)
-                            .on('pointermove', onMove)
-                            .on('pointerup', onEnd);
-                    }
                 }
             }
 
@@ -356,12 +354,6 @@
                         handler.call(target, ev, that);
                     }
 
-                    if (ev.type == 'pointerup') {
-                        $(document)
-                            .off('pointermove', onMove)
-                            .off('pointerup', onEnd);
-                    }
-
                     target = false;
 
                     util.preventClick();
@@ -374,8 +366,8 @@
 
             if (s.tap) {
                 el
-                    .on('touchstart.dw pointerdown.dw', onStart)
-                    .on('touchcancel.dw pointercancel.dw', onCancel)
+                    .on('touchstart.dw', onStart)
+                    .on('touchcancel.dw', onCancel)
                     .on('touchmove.dw', onMove)
                     .on('touchend.dw', onEnd);
             }

diff --git a/js/mobiscroll.datetimebase.js b/js/mobiscroll.datetimebase.js
@@ -2,6 +2,7 @@
 
     var ms = $.mobiscroll,
         datetime = ms.datetime,
+        adjustedDate = datetime.adjustedDate,
         date = new Date(),
         defaults = {
             startYear: date.getFullYear() - 100,
@@ -105,8 +106,8 @@
                 stepM = steps.minute || s.stepMinute || 1,
                 stepS = steps.second || s.stepSecond || 1,
                 zeroBased = steps.zeroBased,
-                mind = s.minDate || new Date(s.startYear, 0, 1),
-                maxd = s.maxDate || new Date(s.endYear, 11, 31, 23, 59, 59),
+                mind = s.minDate || adjustedDate(s.startYear, 0, 1),
+                maxd = s.maxDate || adjustedDate(s.endYear, 11, 31, 23, 59, 59),
                 minH = zeroBased ? 0 : mind.getHours() % stepH,
                 minM = zeroBased ? 0 : mind.getMinutes() % stepM,
                 minS = zeroBased ? 0 : mind.getSeconds() % stepS,
@@ -637,7 +638,7 @@
                         if (v.start && v.start.getTime) {
                             start = new Date(v.start);
                             while (start <= v.end) {
-                                ret.push(new Date(start.getFullYear(), start.getMonth(), start.getDate()));
+                                ret.push(adjustedDate(start.getFullYear(), start.getMonth(), start.getDate()));
                                 start.setDate(start.getDate() + 1);
                             }
                         } else {
@@ -747,7 +748,7 @@
                                 max = maxs[i],
                                 maxdays = 31,
                                 val = get(temp, i),
-                                t = $('.dw-ul', dw).eq(o[i]);
+                                t = $('.dwwl' + o[i] + ' .dw-ul', dw);
 
                             if (i == 'd') {
                                 maxdays = s.getMaxDayOfMonth(y, m);
@@ -812,7 +813,7 @@
                         $.each(['a', 'h', 'i', 's'], function (i, v) {
                             var val = get(temp, v),
                                 d = get(temp, 'd'),
-                                t = $('.dw-ul', dw).eq(o[v]);
+                                t = $('.dwwl' + o[v] + ' .dw-ul', dw);
 
                             if (o[v] !== undefined) {
                                 validateTimes(invalid, i, v, temp, y, m, d, t, 0);

diff --git a/js/mobiscroll.frame.js b/js/mobiscroll.frame.js
@@ -3,7 +3,6 @@
         preventShow,
         ms = $.mobiscroll,
         util = ms.util,
-        pr = util.jsPrefix,
         has3d = util.has3d,
         constrain = util.constrain,
         isString = util.isString,
@@ -98,23 +97,27 @@
             var activeEl,
                 value,
                 type,
+                $activeEl = $activeElm,
                 focus = s.focusOnClose;
 
             that._markupRemove();
 
             $markup.remove();
 
-            if ($activeElm && !prevAnim) {
+            if (!prevAnim) {
+                if (!$activeEl) {
+                    $activeEl = $elm;
+                }
                 setTimeout(function () {
                     if (focus === undefined || focus === true) {
                         preventShow = true;
-                        activeEl = $activeElm[0];
+                        activeEl = $activeEl[0];
                         type = activeEl.type;
                         value = activeEl.value;
                         try {
                             activeEl.type = 'button';
                         } catch (ex) {}
-                        $activeElm.focus();
+                        $activeEl.focus();
                         activeEl.type = type;
                         activeEl.value = value;
                     } else if (focus) {
@@ -123,6 +126,8 @@
                 }, 200);
             }
 
+            $activeElm = null;
+
             that._isVisible = false;
 
             event('onHide', []);
@@ -157,11 +162,6 @@
                 beforeShow();
             }
 
-            // Hide virtual keyboard
-            if ($(document.activeElement).is('input,textarea')) {
-                $(document.activeElement).blur();
-            }
-
             if (that.show() !== false) {
                 $activeElm = $elm;
 
@@ -210,16 +210,16 @@
                 totalw = 0,
                 minw = 0,
                 css = {},
-                nw = Math.min($wnd[0].innerWidth || $wnd.innerWidth(), $persp.width()), //$persp.width(), // To get the width without scrollbar
+                nw = Math.min($wnd[0].innerWidth || $wnd.innerWidth(), $persp ? $persp.width() : 0), //$persp.width(), // To get the width without scrollbar
                 nh = $wnd[0].innerHeight || $wnd.innerHeight(),
                 $focused = $(document.activeElement);
 
-            if ($focused.is('input,textarea') && !/(button|submit|checkbox|radio)/.test($focused.attr('type'))) {
+            if (isModal && $focused.is('input,textarea') && !/(button|submit|checkbox|radio)/.test($focused.attr('type'))) {
                 $focused.on('blur', onBlur);
                 return;
             }
 
-            if ((wndWidth === nw && wndHeight === nh && check) || preventPos) {
+            if ((wndWidth === nw && wndHeight === nh && check) || preventPos || !that._isVisible) {
                 return;
             }
 
@@ -461,6 +461,9 @@
                 return false;
             }
 
+            // Hide virtual keyboard
+            document.activeElement.blur();
+
             doAnim = isOldAndroid ? false : s.animate;
 
             if (doAnim !== false) {
@@ -543,7 +546,7 @@
                 }
 
                 // Disable inputs to prevent bleed through (Android bug)
-                if (pr !== 'Moz') {
+                if (isOldAndroid) {
                     $('input,select,button', $ctx).each(function () {
                         if (!this.disabled) {
                             $(this).addClass('dwtd').prop('disabled', true);
@@ -669,7 +672,7 @@
             // Hide wheels and overlay
             if ($markup) {
                 // Re-enable temporary disabled fields
-                if (pr !== 'Moz') {
+                if (isOldAndroid) {
                     $('.dwtd', $ctx).each(function () {
                         $(this).prop('disabled', false).removeClass('dwtd');
                     });

diff --git a/js/mobiscroll.scroller.js b/js/mobiscroll.scroller.js
@@ -228,7 +228,7 @@
 
         function isReadOnly(wh) {
             if ($.isArray(s.readonly)) {
-                var i = $('.dwwl', $markup).index(wh);
+                var i = +$(wh).attr('data-index');
                 return s.readonly[i];
             }
             return s.readonly;
@@ -259,7 +259,7 @@
             multiple = t.closest('.dwwl').hasClass('dwwms');
             min = $('.dw-li', t).index($(multiple ? '.dw-li' : '.dw-v', t).eq(0));
             max = Math.max(min, $('.dw-li', t).index($(multiple ? '.dw-li' : '.dw-v', t).eq(-1)) - (multiple ? s.rows - (s.mode == 'scroller' ? 1 : 3) : 0));
-            index = $('.dw-ul', $markup).index(t);
+            index = +t.closest('.dwwl').attr('data-index');
         }
 
         function formatHeader(v) {
@@ -372,8 +372,9 @@
             // Call validation event
             if (trigger('validate', [$markup, index, time, dir]) !== false) {
                 // Set scrollers to position
-                $('.dw-ul', $markup).each(function (i) {
+                $('.dw-ul', $markup).each(function () {
                     var t = $(this),
+                        i = +t.closest('.dwwl').attr('data-index'),
                         multiple = t.closest('.dwwl').hasClass('dwwms'),
                         sc = i == index || index === undefined,
                         res = getValid(that._tempWheelArray[i], t, dir, multiple, true),
@@ -527,7 +528,7 @@
                     $.each(wg, function (k, w) {
                         if ($.inArray(i, idx) > -1) {
                             wheels[i] = w;
-                            $('.dw-ul', $markup).eq(i).html(generateWheelItems(i));
+                            $('.dwwl' + i + ' .dw-ul', $markup).html(generateWheelItems(i));
                             nr--;
                             if (!nr) {
                                 that.position();
@@ -570,7 +571,7 @@
                         (s.fixedWidth ? ('width:' + (s.fixedWidth[l] || s.fixedWidth) + 'px;') :
                             (s.minWidth ? ('min-width:' + (s.minWidth[l] || s.minWidth) + 'px;') : 'min-width:' + s.width + 'px;') +
                             (s.maxWidth ? ('max-width:' + (s.maxWidth[l] || s.maxWidth) + 'px;') : '')) + '">' +
-                        '<div class="dwwl dwwl' + l + (w.multiple ? ' dwwms' : '') + '">' +
+                        '<div class="dwwl dwwl' + l + (w.multiple ? ' dwwms' : '') + '" data-index="' + l + '">' +
                         (s.mode != 'scroller' ?
                             '<div class="dwb-e dwwb dwwbp ' + (s.btnPlusClass || '') + '" style="height:' + itemHeight + 'px;line-height:' + itemHeight + 'px;"><span>+</span></div>' + // + button
                             '<div class="dwb-e dwwb dwwbm ' + (s.btnMinusClass || '') + '" style="height:' + itemHeight + 'px;line-height:' + itemHeight + 'px;"><span>&ndash;</span></div>' : '') + // - button

diff --git a/js/mobiscroll.select.js b/js/mobiscroll.select.js
@@ -402,7 +402,7 @@
             inst._tempWheelArray = groupWheel ? [group, option] : [option];
 
             if (inst._isVisible) {
-                inst.changeWheel(groupWheel ? [groupWheelIdx, optionWheelIdx] : [optionWheelIdx]);
+                inst.changeWheel(groupWheel ? [groupWheelIdx, optionWheelIdx] : [optionWheelIdx], 0, true);
             }
         };