timepicker 1.14.1 → 1.15.0

package/jquery.timepicker.js

@@ -1,171 +1,137 @@
 /*!
- * jquery-timepicker v1.14.1 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * jquery-timepicker v1.15.0 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
  * Copyright (c) 2021 Jon Thornton - https://www.jonthornton.com/jquery-timepicker/
  * License: MIT
  */
 (function () {
   'use strict';
 
-  function _typeof(obj) {
-    "@babel/helpers - typeof";
-
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
-  }
-
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  }
-
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
   }
-
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
   }
-
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || false, o.configurable = true, "value" in o && (o.writable = true), Object.defineProperty(e, _toPropertyKey(o.key), o);
     }
-
-    return obj;
   }
-
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-      if (enumerableOnly) symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-      keys.push.apply(keys, symbols);
-    }
-
-    return keys;
+  function _createClass(e, r, t) {
+    return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+      writable: false
+    }), e;
   }
-
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-
-    return target;
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-  }
-
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it;
-
-    if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-
-        var F = function () {};
-
+  function _createForOfIteratorHelper(r, e) {
+    var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (!t) {
+      if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+        t && (r = t);
+        var n = 0,
+          F = function () {};
         return {
           s: F,
           n: function () {
-            if (i >= o.length) return {
+            return n >= r.length ? {
               done: true
-            };
-            return {
+            } : {
               done: false,
-              value: o[i++]
+              value: r[n++]
             };
           },
-          e: function (e) {
-            throw e;
+          e: function (r) {
+            throw r;
           },
           f: F
         };
       }
-
       throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
     }
-
-    var normalCompletion = true,
-        didErr = false,
-        err;
+    var o,
+      a = true,
+      u = false;
     return {
       s: function () {
-        it = o[Symbol.iterator]();
+        t = t.call(r);
       },
       n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
+        var r = t.next();
+        return a = r.done, r;
       },
-      e: function (e) {
-        didErr = true;
-        err = e;
+      e: function (r) {
+        u = true, o = r;
       },
       f: function () {
         try {
-          if (!normalCompletion && it.return != null) it.return();
+          a || null == t.return || t.return();
         } finally {
-          if (didErr) throw err;
+          if (u) throw o;
         }
       }
     };
   }
+  function _defineProperty(e, r, t) {
+    return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+      value: t,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    }) : e[r] = t, e;
+  }
+  function ownKeys(e, r) {
+    var t = Object.keys(e);
+    if (Object.getOwnPropertySymbols) {
+      var o = Object.getOwnPropertySymbols(e);
+      r && (o = o.filter(function (r) {
+        return Object.getOwnPropertyDescriptor(e, r).enumerable;
+      })), t.push.apply(t, o);
+    }
+    return t;
+  }
+  function _objectSpread2(e) {
+    for (var r = 1; r < arguments.length; r++) {
+      var t = null != arguments[r] ? arguments[r] : {};
+      r % 2 ? ownKeys(Object(t), true).forEach(function (r) {
+        _defineProperty(e, r, t[r]);
+      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+        Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+      });
+    }
+    return e;
+  }
+  function _toPrimitive(t, e) {
+    if ("object" != typeof t || !t) return t;
+    var r;
+    if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
+      var i = r.call(t, e);
+      if ("object" != typeof i) return i;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return (String )(t);
+  }
+  function _toPropertyKey(t) {
+    var i = _toPrimitive(t, "string");
+    return "symbol" == typeof i ? i : i + "";
+  }
+  function _typeof(o) {
+    "@babel/helpers - typeof";
+
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+      return typeof o;
+    } : function (o) {
+      return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+    }, _typeof(o);
+  }
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+    }
+  }
 
   var ONE_DAY = 86400;
   var EVENT_DEFAULTS = {
@@ -175,35 +141,58 @@
   };
 
   var roundingFunction = function roundingFunction(seconds, settings) {
+    var _settings$minTime;
     if (seconds === null) {
       return null;
     }
 
+    // Steps are counted from minTime, the same way the dropdown is built.
+    // Times before minTime belong to the next day when the list wraps past
+    // midnight.
+    var start = (_settings$minTime = settings.minTime()) !== null && _settings$minTime !== void 0 ? _settings$minTime : 0;
+    if (seconds < start) {
+      seconds += ONE_DAY;
+    }
     var i = 0;
-    var nextVal = 0;
-
+    var nextVal = start;
     while (nextVal < seconds) {
       i++;
       nextVal += settings.step(i) * 60;
     }
-
     var prevVal = nextVal - settings.step(i - 1) * 60;
-
     if (seconds - prevVal < nextVal - seconds) {
       return moduloSeconds(prevVal, settings);
     } else {
       return moduloSeconds(nextVal, settings);
     }
   };
-
   function moduloSeconds(seconds, settings) {
     if (seconds == ONE_DAY && settings.show2400) {
       return seconds;
     }
-
     return seconds % ONE_DAY;
   }
 
+  // The span of times the dropdown covers. minTime defaults to midnight and
+  // maxTime to 24 hours after minTime; end is pushed into the next day when the
+  // range wraps past midnight.
+  function timeWindow(settings) {
+    var _settings$minTime2, _settings$maxTime;
+    var start = (_settings$minTime2 = settings.minTime()) !== null && _settings$minTime2 !== void 0 ? _settings$minTime2 : 0;
+    var end = (_settings$maxTime = settings.maxTime()) !== null && _settings$maxTime !== void 0 ? _settings$maxTime : start + ONE_DAY - 1;
+    if (end < start) {
+      end += ONE_DAY;
+    }
+    if (end === ONE_DAY - 1 && typeof settings.timeFormat === "string" && settings.show2400) {
+      // include a 24:00 option when using military time
+      end = ONE_DAY;
+    }
+    return {
+      start: start,
+      end: end
+    };
+  }
+
   var DEFAULT_SETTINGS = {
     appendTo: "body",
     className: null,
@@ -247,34 +236,28 @@
   var Timepicker = /*#__PURE__*/function () {
     function Timepicker(targetEl) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       _classCallCheck(this, Timepicker);
-
       this._handleFormatValue = this._handleFormatValue.bind(this);
       this._handleKeyUp = this._handleKeyUp.bind(this);
       this.targetEl = targetEl;
       var attrOptions = Timepicker.extractAttrOptions(targetEl, Object.keys(DEFAULT_SETTINGS));
       this.settings = this.parseSettings(_objectSpread2(_objectSpread2(_objectSpread2({}, DEFAULT_SETTINGS), options), attrOptions));
     }
-
-    _createClass(Timepicker, [{
+    return _createClass(Timepicker, [{
       key: "hideMe",
       value: function hideMe() {
         if (this.settings.useSelect) {
           this.targetEl.blur();
           return;
         }
-
         if (!this.list || !Timepicker.isVisible(this.list)) {
           return;
         }
-
         if (this.settings.selectOnBlur) {
           this._selectValue();
         }
-
         this.list.hide();
-        var hideTimepickerEvent = new CustomEvent('hideTimepicker', EVENT_DEFAULTS);
+        var hideTimepickerEvent = new CustomEvent("hideTimepicker", EVENT_DEFAULTS);
         this.targetEl.dispatchEvent(hideTimepickerEvent);
       }
     }, {
@@ -283,21 +266,16 @@
         if (!value && value !== 0) {
           return false;
         }
-
         var out = false;
         var value = this.settings.roundingFunction(value, this.settings);
-
         if (!this.list) {
           return false;
         }
-
         this.list.find("li").each(function (i, obj) {
           var parsed = parseInt(obj.dataset.time);
-
           if (isNaN(parsed)) {
             return;
           }
-
           if (parsed == value) {
             out = obj;
             return false;
@@ -317,24 +295,19 @@
           if (value !== null || this.targetEl.value != "") {
             this.targetEl.value = value;
           }
-
           var tp = this;
           var settings = tp.settings;
-
           if (settings.useSelect && source != "select" && tp.list) {
-            tp.list.val(tp._roundAndFormatTime(tp.anytime2int(value)));
+            tp.list.val(settings.roundingFunction(tp.anytime2int(value), settings));
           }
         }
-
-        var selectTimeEvent = new CustomEvent('selectTime', EVENT_DEFAULTS);
-
+        var selectTimeEvent = new CustomEvent("selectTime", EVENT_DEFAULTS);
         if (this.selectedValue != value) {
           this.selectedValue = value;
-          var changeTimeEvent = new CustomEvent('changeTime', EVENT_DEFAULTS);
-          var changeEvent = new CustomEvent('change', Object.assign(EVENT_DEFAULTS, {
-            detail: 'timepicker'
+          var changeTimeEvent = new CustomEvent("changeTime", EVENT_DEFAULTS);
+          var changeEvent = new CustomEvent("change", Object.assign(EVENT_DEFAULTS, {
+            detail: "timepicker"
           }));
-
           if (source == "select") {
             this.targetEl.dispatchEvent(selectTimeEvent);
             this.targetEl.dispatchEvent(changeTimeEvent);
@@ -342,13 +315,11 @@
           } else if (["error", "initial"].indexOf(source) == -1) {
             this.targetEl.dispatchEvent(changeTimeEvent);
           }
-
           return true;
         } else {
           if (["error", "initial"].indexOf(source) == -1) {
             this.targetEl.dispatchEvent(selectTimeEvent);
           }
-
           return false;
         }
       }
@@ -369,45 +340,39 @@
         tp.settings;
         var list = tp.list;
         var cursor = list.find(".ui-timepicker-selected");
-
         if (cursor.hasClass("ui-timepicker-disabled")) {
           return false;
         }
-
         if (!cursor.length) {
           return true;
         }
+        var timeValue = cursor.get(0).dataset.time;
 
-        var timeValue = cursor.get(0).dataset.time; // selected value found
-
+        // selected value found
         if (timeValue) {
           var parsedTimeValue = parseInt(timeValue);
-
           if (!isNaN(parsedTimeValue)) {
             timeValue = parsedTimeValue;
           }
         }
-
         if (timeValue !== null) {
           if (typeof timeValue != "string") {
             timeValue = tp._int2time(timeValue);
           }
-
           tp._setTimeValue(timeValue, "select");
         }
-
         return true;
       }
     }, {
       key: "anytime2int",
       value: function anytime2int(input) {
-        if (typeof input === 'number') {
+        if (typeof input === "number") {
           return input;
-        } else if (typeof input === 'string') {
+        } else if (typeof input === "string") {
           return this.time2int(input);
-        } else if (_typeof(input) === 'object' && input instanceof Date) {
+        } else if (_typeof(input) === "object" && input instanceof Date) {
           return input.getHours() * 3600 + input.getMinutes() * 60 + input.getSeconds();
-        } else if (typeof input == 'function') {
+        } else if (typeof input == "function") {
           return input();
         } else {
           return null;
@@ -419,56 +384,44 @@
         if (timeString === "" || timeString === null || timeString === undefined) {
           return null;
         }
-
-        if (timeString === 'now') {
+        if (timeString === "now") {
           return this.anytime2int(new Date());
         }
-
         if (typeof timeString != "string") {
           return timeString;
         }
+        timeString = timeString.toLowerCase().replace(/[\s\.]/g, "");
 
-        timeString = timeString.toLowerCase().replace(/[\s\.]/g, ""); // if the last character is an "a" or "p", add the "m"
-
+        // if the last character is an "a" or "p", add the "m"
         if (this.settings.lang.am === "am" && (timeString.slice(-1) == "a" || timeString.slice(-1) == "p")) {
           timeString += "m";
         }
-
         var pattern = /^(([^0-9]*))?([0-9]?[0-9])(([0-5][0-9]))?(([0-5][0-9]))?(([^0-9]*))$/;
         var hasDelimetersMatch = timeString.match(/\W/);
-
         if (hasDelimetersMatch) {
           pattern = /^(([^0-9]*))?([0-9]?[0-9])(\W+([0-5][0-9]?))?(\W+([0-5][0-9]))?(([^0-9]*))$/;
         }
-
         var time = timeString.match(pattern);
-
         if (!time) {
           return null;
         }
-
         var hour = parseInt(time[3] * 1, 10);
         var ampm = time[2] || time[9];
         var minutes = this.parseMinuteString(time[5]);
         var seconds = time[7] * 1 || 0;
-
         if (!ampm && time[3].length == 2 && time[3][0] == "0") {
           // preceding '0' implies AM
           ampm = "am";
         }
-
         if (hour > 24 && !minutes) {
           // if someone types in something like "83", turn it into "8h 30m"
           hour = time[3][0] * 1;
           minutes = this.parseMinuteString(time[3][1]);
         }
-
         var hours = hour;
-
         if (hour <= 12 && ampm) {
           ampm = ampm.trim();
           var isPm = ampm == this.settings.lang.pm || ampm == this.settings.lang.PM;
-
           if (hour == 12) {
             hours = isPm ? 12 : 0;
           } else {
@@ -476,26 +429,34 @@
           }
         } else {
           var t = hour * 3600 + minutes * 60 + seconds;
-
           if (t >= ONE_DAY + (this.settings.show2400 ? 1 : 0)) {
             if (this.settings.wrapHours === false) {
               return null;
             }
-
             hours = hour % 24;
           }
         }
-
-        var timeInt = hours * 3600 + minutes * 60 + seconds; // if no am/pm provided, intelligently guess based on the scrollDefault
-
-        if (hour < 12 && !ampm && this.settings._twelveHourTime && this.settings.scrollDefault()) {
-          var delta = timeInt - this.settings.scrollDefault();
-
-          if (delta < 0 && delta >= ONE_DAY / -2) {
-            timeInt = (timeInt + ONE_DAY / 2) % ONE_DAY;
+        var timeInt = hours * 3600 + minutes * 60 + seconds;
+
+        // if no am/pm provided, intelligently guess based on the scrollDefault
+        if (hour < 12 && !ampm && this.settings._twelveHourTime &&
+        // scrollDefault can itself be an am/pm-less string, which would send us
+        // back into time2int; parse it literally rather than recursing forever
+        !this._resolvingScrollDefault) {
+          this._resolvingScrollDefault = true;
+          var scrollDefault;
+          try {
+            scrollDefault = this.settings.scrollDefault();
+          } finally {
+            this._resolvingScrollDefault = false;
+          }
+          if (scrollDefault) {
+            var delta = timeInt - scrollDefault;
+            if (delta < 0 && delta >= ONE_DAY / -2) {
+              timeInt = (timeInt + ONE_DAY / 2) % ONE_DAY;
+            }
           }
         }
-
         return timeInt;
       }
     }, {
@@ -504,25 +465,21 @@
         if (!minutesString) {
           minutesString = 0;
         }
-
         var multiplier = 1;
-
         if (minutesString.length == 1) {
           multiplier = 10;
         }
-
         return parseInt(minutesString) * multiplier || 0;
       }
     }, {
       key: "intStringDateOrFunc2func",
       value: function intStringDateOrFunc2func(input) {
         var _this = this;
-
         if (input === null || input === undefined) {
           return function () {
             return null;
           };
-        } else if (typeof input === 'function') {
+        } else if (typeof input === "function") {
           return function () {
             return _this.anytime2int(input());
           };
@@ -535,47 +492,38 @@
     }, {
       key: "parseSettings",
       value: function parseSettings(settings) {
-        settings.lang = _objectSpread2(_objectSpread2({}, DEFAULT_LANG), settings.lang); // lang is used by other functions the rest of this depends on
-        // todo: unwind circular dependency on lang
+        settings.lang = _objectSpread2(_objectSpread2({}, DEFAULT_LANG), settings.lang);
 
+        // lang is used by other functions the rest of this depends on
+        // todo: unwind circular dependency on lang
         this.settings = settings;
-
         if (settings.listWidth) {
           settings.listWidth = this.anytime2int(settings.listWidth);
         }
-
         settings.minTime = this.intStringDateOrFunc2func(settings.minTime);
         settings.maxTime = this.intStringDateOrFunc2func(settings.maxTime);
         settings.durationTime = this.intStringDateOrFunc2func(settings.durationTime);
-
         if (settings.scrollDefault) {
           settings.scrollDefault = this.intStringDateOrFunc2func(settings.scrollDefault);
         } else {
           settings.scrollDefault = settings.minTime;
         }
-
         if (typeof settings.timeFormat === "string" && settings.timeFormat.match(/[gh]/)) {
           settings._twelveHourTime = true;
         }
-
-        if (typeof settings.step != 'function') {
+        if (typeof settings.step != "function") {
           var curryStep = settings.step;
-
           settings.step = function () {
             return curryStep;
           };
         }
-
         settings.disableTimeRanges = this._parseDisableTimeRanges(settings.disableTimeRanges);
-
         if (settings.closeOnWindowScroll && !settings.closeOnScroll) {
           settings.closeOnScroll = settings.closeOnWindowScroll;
         }
-
         if (settings.closeOnScroll === true) {
           settings.closeOnScroll = window.document;
         }
-
         return settings;
       }
     }, {
@@ -583,41 +531,39 @@
       value: function _parseDisableTimeRanges(disableTimeRanges) {
         if (!disableTimeRanges || disableTimeRanges.length == 0) {
           return [];
-        } // convert string times to integers
-
+        }
 
+        // convert string times to integers
         for (var i in disableTimeRanges) {
           disableTimeRanges[i] = [this.anytime2int(disableTimeRanges[i][0]), this.anytime2int(disableTimeRanges[i][1])];
-        } // sort by starting time
-
+        }
 
+        // sort by starting time
         disableTimeRanges = disableTimeRanges.sort(function (a, b) {
           return a[0] - b[0];
-        }); // merge any overlapping ranges
+        });
 
+        // merge any overlapping ranges
         for (var i = disableTimeRanges.length - 1; i > 0; i--) {
           if (disableTimeRanges[i][0] <= disableTimeRanges[i - 1][1]) {
             disableTimeRanges[i - 1] = [Math.min(disableTimeRanges[i][0], disableTimeRanges[i - 1][0]), Math.max(disableTimeRanges[i][1], disableTimeRanges[i - 1][1])];
             disableTimeRanges.splice(i, 1);
           }
         }
-
         return disableTimeRanges;
       }
+
       /*
        *  Filter freeform input
        */
-
     }, {
       key: "_disableTextInputHandler",
       value: function _disableTextInputHandler(e) {
         switch (e.keyCode) {
           case 13: // return
-
           case 9:
             //tab
             return;
-
           default:
             e.preventDefault();
         }
@@ -627,31 +573,30 @@
       value: function _int2duration(seconds, step) {
         seconds = Math.abs(seconds);
         var minutes = Math.round(seconds / 60),
-            duration = [],
-            hours,
-            mins;
-
+          duration = [],
+          hours,
+          mins;
         if (minutes < 60) {
           // Only show (x mins) under 1 hour
           duration = [minutes, this.settings.lang.mins];
         } else {
           hours = Math.floor(minutes / 60);
-          mins = minutes % 60; // Show decimal notation (eg: 1.5 hrs) for 30 minute steps
+          mins = minutes % 60;
 
+          // Show decimal notation (eg: 1.5 hrs) for 30 minute steps
           if (step == 30 && mins == 30) {
             hours += this.settings.lang.decimal + 5;
           }
-
           duration.push(hours);
-          duration.push(hours == 1 ? this.settings.lang.hr : this.settings.lang.hrs); // Show remainder minutes notation (eg: 1 hr 15 mins) for non-30 minute steps
-          // and only if there are remainder minutes to show
+          duration.push(hours == 1 ? this.settings.lang.hr : this.settings.lang.hrs);
 
+          // Show remainder minutes notation (eg: 1 hr 15 mins) for non-30 minute steps
+          // and only if there are remainder minutes to show
           if (step != 30 && mins) {
             duration.push(mins);
             duration.push(this.settings.lang.mins);
           }
         }
-
         return duration.join(" ");
       }
     }, {
@@ -659,7 +604,6 @@
       value: function _roundAndFormatTime(seconds) {
         // console.log('_roundAndFormatTime')
         seconds = this.settings.roundingFunction(seconds, this.settings);
-
         if (seconds !== null) {
           return this._int2time(seconds);
         }
@@ -670,83 +614,65 @@
         if (typeof timeInt != "number") {
           return null;
         }
-
         var seconds = parseInt(timeInt % 60),
-            minutes = parseInt(timeInt / 60 % 60),
-            hours = parseInt(timeInt / (60 * 60) % 24);
+          minutes = parseInt(timeInt / 60 % 60),
+          hours = parseInt(timeInt / (60 * 60) % 24);
         var time = new Date(1970, 0, 2, hours, minutes, seconds, 0);
-
         if (isNaN(time.getTime())) {
           return null;
         }
-
         if (typeof this.settings.timeFormat === "function") {
           return this.settings.timeFormat(time);
         }
-
         var output = "";
         var hour, code;
-
         for (var i = 0; i < this.settings.timeFormat.length; i++) {
           code = this.settings.timeFormat.charAt(i);
-
           switch (code) {
             case "a":
               output += time.getHours() > 11 ? this.settings.lang.pm : this.settings.lang.am;
               break;
-
             case "A":
               output += time.getHours() > 11 ? this.settings.lang.PM : this.settings.lang.AM;
               break;
-
             case "g":
               hour = time.getHours() % 12;
               output += hour === 0 ? "12" : hour;
               break;
-
             case "G":
               hour = time.getHours();
               if (timeInt === ONE_DAY) hour = this.settings.show2400 ? 24 : 0;
               output += hour;
               break;
-
             case "h":
               hour = time.getHours() % 12;
-
               if (hour !== 0 && hour < 10) {
                 hour = "0" + hour;
               }
-
               output += hour === 0 ? "12" : hour;
               break;
-
             case "H":
               hour = time.getHours();
               if (timeInt === ONE_DAY) hour = this.settings.show2400 ? 24 : 0;
               output += hour > 9 ? hour : "0" + hour;
               break;
-
             case "i":
               var minutes = time.getMinutes();
               output += minutes > 9 ? minutes : "0" + minutes;
               break;
-
             case "s":
               seconds = time.getSeconds();
               output += seconds > 9 ? seconds : "0" + seconds;
               break;
-
             case "\\":
               // escape character; add the next character and skip ahead
               i++;
               output += this.settings.timeFormat.charAt(i);
               break;
-
             default:
               output += code;
           }
         }
-
         return output;
       }
     }, {
@@ -755,27 +681,21 @@
         var list = this.list;
         list.find("li").removeClass("ui-timepicker-selected");
         var timeValue = this.anytime2int(this._getTimeValue());
-
         if (timeValue === null) {
           return;
         }
-
         var selected = this._findRow(timeValue);
-
         if (selected) {
           var selectedRect = selected.getBoundingClientRect();
           var listRect = list.get(0).getBoundingClientRect();
           var topDelta = selectedRect.top - listRect.top;
-
           if (topDelta + selectedRect.height > listRect.height || topDelta < 0) {
             var newScroll = list.scrollTop() + (selectedRect.top - listRect.top) - selectedRect.height;
             list.scrollTop(newScroll);
           }
-
           var parsed = parseInt(selected.dataset.time);
-
           if (this.settings.forceRoundTime || parsed === timeValue) {
-            selected.classList.add('ui-timepicker-selected');
+            selected.classList.add("ui-timepicker-selected");
           }
         }
       }
@@ -790,7 +710,6 @@
         if (e && e.detail == "timepicker") {
           return;
         }
-
         this._formatValue(e);
       }
     }, {
@@ -798,41 +717,32 @@
       value: function _formatValue(e, origin) {
         if (this.targetEl.value === "") {
           this._setTimeValue(null, origin);
-
           return;
-        } // IE fires change event before blur
-
+        }
 
+        // IE fires change event before blur
         if (this._isFocused(this.targetEl) && (!e || e.type != "change")) {
           return;
         }
-
         var settings = this.settings;
         var seconds = this.anytime2int(this.targetEl.value);
-
         if (seconds === null) {
-          var timeFormatErrorEvent = new CustomEvent('timeFormatError', EVENT_DEFAULTS);
+          var timeFormatErrorEvent = new CustomEvent("timeFormatError", EVENT_DEFAULTS);
           this.targetEl.dispatchEvent(timeFormatErrorEvent);
           return;
         }
-
         var rangeError = this._isTimeRangeError(seconds, settings);
-
         if (settings.forceRoundTime) {
           var roundSeconds = settings.roundingFunction(seconds, settings);
-
           if (roundSeconds != seconds) {
             seconds = roundSeconds;
             origin = null;
           }
         }
-
         var prettyTime = this._int2time(seconds);
-
         if (rangeError) {
           this._setTimeValue(prettyTime);
-
-          var timeRangeErrorEvent = new CustomEvent('timeRangeError', EVENT_DEFAULTS);
+          var timeRangeErrorEvent = new CustomEvent("timeRangeError", EVENT_DEFAULTS);
           this.targetEl.dispatchEvent(timeRangeErrorEvent);
         } else {
           this._setTimeValue(prettyTime, origin);
@@ -841,19 +751,22 @@
     }, {
       key: "_isTimeRangeError",
       value: function _isTimeRangeError(seconds, settings) {
-        // check that the time in within bounds
-        if (settings.minTime !== null && settings.maxTime !== null && (seconds < settings.minTime() || seconds > settings.maxTime())) {
+        // check that the time is within the span the dropdown covers. Times
+        // before the start belong to the next day.
+        var _timeWindow = timeWindow(settings),
+          start = _timeWindow.start,
+          end = _timeWindow.end;
+        var offset = seconds < start ? seconds + ONE_DAY : seconds;
+        if (offset > end) {
           return true;
-        } // check that time isn't within disabled time ranges
-
+        }
 
+        // check that time isn't within disabled time ranges
         var _iterator = _createForOfIteratorHelper(settings.disableTimeRanges),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var range = _step.value;
-
             if (seconds >= range[0] && seconds < range[1]) {
               return true;
             }
@@ -863,14 +776,12 @@
         } finally {
           _iterator.f();
         }
-
         return false;
       }
     }, {
       key: "_generateNoneElement",
       value: function _generateNoneElement(optionValue, useSelect) {
         var label, className, value;
-
         if (_typeof(optionValue) == "object") {
           label = optionValue.label;
           className = optionValue.className;
@@ -881,9 +792,7 @@
         } else {
           $.error("Invalid noneOption value");
         }
-
         var el;
-
         if (useSelect) {
           el = document.createElement("option");
           el.value = value;
@@ -891,24 +800,21 @@
           el = document.createElement("li");
           el.dataset.time = String(value);
         }
-
         el.innerText = label;
         el.classList.add(className);
         return el;
       }
+
       /*
        *  Time typeahead
        */
-
     }, {
       key: "_handleKeyUp",
       value: function _handleKeyUp(e) {
         var _this2 = this;
-
         if (!this.list || !Timepicker.isVisible(this.list) || this.settings.disableTextInput) {
           return true;
         }
-
         if (e.type === "paste" || e.type === "cut") {
           var handler = function handler() {
             if (_this2.settings.typeaheadHighlight) {
@@ -917,14 +823,11 @@
               _this2.list.hide();
             }
           };
-
           setTimeout(handler, 0);
           return;
         }
-
         switch (e.keyCode) {
           case 96: // numpad numerals
-
           case 97:
           case 98:
           case 99:
@@ -935,7 +838,6 @@
           case 104:
           case 105:
           case 48: // numerals
-
           case 49:
           case 50:
           case 51:
@@ -946,15 +848,10 @@
           case 56:
           case 57:
           case 65: // a
-
           case 77: // m
-
           case 80: // p
-
           case 186: // colon
-
           case 8: // backspace
-
           case 46:
             // delete
             if (this.settings.typeaheadHighlight) {
@@ -962,7 +859,6 @@
             } else {
               this.list.hide();
             }
-
             break;
         }
       }
@@ -970,14 +866,11 @@
       key: "extractAttrOptions",
       value: function extractAttrOptions(element, keys) {
         var output = {};
-
         var _iterator2 = _createForOfIteratorHelper(keys),
-            _step2;
-
+          _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var key = _step2.value;
-
             if (key in element.dataset) {
               output[key] = element.dataset[key];
             }
@@ -987,7 +880,6 @@
         } finally {
           _iterator2.f();
         }
-
         return output;
       }
     }, {
@@ -999,14 +891,12 @@
     }, {
       key: "hideAll",
       value: function hideAll() {
-        var _iterator3 = _createForOfIteratorHelper(document.getElementsByClassName('ui-timepicker-input')),
-            _step3;
-
+        var _iterator3 = _createForOfIteratorHelper(document.getElementsByClassName("ui-timepicker-input")),
+          _step3;
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var el = _step3.value;
             var tp = el.timepickerObj;
-
             if (tp) {
               tp.hideMe();
             }
@@ -1018,25 +908,18 @@
         }
       }
     }]);
-
-    return Timepicker;
   }(); // IE9-11 polyfill for CustomEvent
-
-
   (function () {
     if (typeof window.CustomEvent === "function") return false;
-
     function CustomEvent(event, params) {
       if (!params) {
         params = {};
       }
-
       params = Object.assign(EVENT_DEFAULTS, params);
-      var evt = document.createEvent('CustomEvent');
+      var evt = document.createEvent("CustomEvent");
       evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
       return evt;
     }
-
     window.CustomEvent = CustomEvent;
   })();
 
@@ -1044,90 +927,60 @@
     if (!settings.noneOption) {
       return [];
     }
-
     var noneOptions = _getNoneOptionItemsHelper(settings.noneOption);
-
     if (Array.isArray(settings.noneOption)) {
       return noneOptions;
     } else {
       return [noneOptions];
     }
   }
-
   function _getNoneOptionItemsHelper(noneOption) {
     if (Array.isArray(noneOption)) {
       return noneOption.map(_getNoneOptionItemsHelper);
     }
-
     if (noneOption === true) {
       return {
-        'label': 'None',
-        'value': ''
+        label: "None",
+        value: ""
       };
     }
-
-    if (_typeof(noneOption) === 'object') {
+    if (_typeof(noneOption) === "object") {
       return noneOption;
     }
-
     return {
-      'label': noneOption,
-      'value': ''
+      label: noneOption,
+      value: ""
     };
   }
-
   function _getDropdownTimes(tp) {
-    var _settings$minTime, _settings$maxTime;
-
     var settings = tp.settings;
-    var start = (_settings$minTime = settings.minTime()) !== null && _settings$minTime !== void 0 ? _settings$minTime : 0;
-    var end = (_settings$maxTime = settings.maxTime()) !== null && _settings$maxTime !== void 0 ? _settings$maxTime : start + ONE_DAY - 1;
-
-    if (end < start) {
-      // make sure the end time is greater than start time, otherwise there will be no list to show
-      end += ONE_DAY;
-    }
-
-    if (end === ONE_DAY - 1 && typeof settings.timeFormat === 'string' && settings.show2400) {
-      // show a 24:00 option when using military time
-      end = ONE_DAY;
-    }
-
+    var _timeWindow = timeWindow(settings),
+      start = _timeWindow.start,
+      end = _timeWindow.end;
     var output = [];
-
     for (var i = start, j = 0; i <= end; j++, i += settings.step(j) * 60) {
       var timeInt = i;
-
       var timeString = tp._int2time(timeInt);
-
-      var className = timeInt % ONE_DAY < ONE_DAY / 2 ? 'ui-timepicker-am' : 'ui-timepicker-pm';
+      var className = timeInt % ONE_DAY < ONE_DAY / 2 ? "ui-timepicker-am" : "ui-timepicker-pm";
       var item = {
-        'label': timeString,
-        'value': moduloSeconds(timeInt, settings),
-        'className': className
+        label: timeString,
+        value: moduloSeconds(timeInt, settings),
+        className: className
       };
-
       if ((settings.minTime() !== null || settings.durationTime() !== null) && settings.showDuration) {
         var _settings$durationTim;
-
         var durStart = (_settings$durationTim = settings.durationTime()) !== null && _settings$durationTim !== void 0 ? _settings$durationTim : settings.minTime();
-
         if (durStart > i) {
           durStart -= ONE_DAY;
         }
-
         var durationString = tp._int2duration(i - durStart, settings.step());
-
         item.duration = durationString;
       }
-
       var _iterator = _createForOfIteratorHelper(settings.disableTimeRanges),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var range = _step.value;
-
           if (timeInt % ONE_DAY >= range[0] && timeInt % ONE_DAY < range[1]) {
             item.disabled = true;
             break;
@@ -1138,68 +991,52 @@
       } finally {
         _iterator.f();
       }
-
       output.push(item);
     }
-
     return output;
   }
-
   function _renderSelectItem(item) {
-    var el = document.createElement('option');
-    el.value = item.value || item.label;
-
+    var _item$value;
+    var el = document.createElement("option");
+    el.value = (_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : item.label;
     if (item.duration) {
-      el.appendChild(document.createTextNode(item.label + ' (' + item.duration + ')'));
+      el.appendChild(document.createTextNode(item.label + " (" + item.duration + ")"));
     } else {
       el.appendChild(document.createTextNode(item.label));
     }
-
     if (item.disabled) {
       el.disabled = true;
     }
-
     return el;
   }
-
   function _renderStandardItem(item) {
-    var el = document.createElement('li');
-    el.dataset['time'] = item.value;
-
+    var el = document.createElement("li");
+    el.dataset["time"] = item.value;
     if (item.className) {
       el.classList.add(item.className);
     }
-
     el.className = item.className;
     el.appendChild(document.createTextNode(item.label));
-
     if (item.duration) {
-      var durationEl = document.createElement('span');
-      durationEl.appendChild(document.createTextNode('(' + item.duration + ')'));
-      durationEl.classList.add('ui-timepicker-duration');
+      var durationEl = document.createElement("span");
+      durationEl.appendChild(document.createTextNode("(" + item.duration + ")"));
+      durationEl.classList.add("ui-timepicker-duration");
       el.appendChild(durationEl);
     }
-
     if (item.disabled) {
-      el.classList.add('ui-timepicker-disabled');
+      el.classList.add("ui-timepicker-disabled");
     }
-
     return el;
   }
-
   function _renderStandardList(items) {
-    var list = document.createElement('ul');
-    list.classList.add('ui-timepicker-list');
-
+    var list = document.createElement("ul");
+    list.classList.add("ui-timepicker-list");
     var _iterator2 = _createForOfIteratorHelper(items),
-        _step2;
-
+      _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var item = _step2.value;
-
         var itemEl = _renderStandardItem(item);
-
         list.appendChild(itemEl);
       }
     } catch (err) {
@@ -1207,33 +1044,26 @@
     } finally {
       _iterator2.f();
     }
-
-    var wrapper = document.createElement('div');
-    wrapper.classList.add('ui-timepicker-wrapper');
+    var wrapper = document.createElement("div");
+    wrapper.classList.add("ui-timepicker-wrapper");
     wrapper.tabIndex = -1;
-    wrapper.style.display = 'none';
-    wrapper.style.position = 'absolute';
+    wrapper.style.display = "none";
+    wrapper.style.position = "absolute";
     wrapper.appendChild(list);
     return wrapper;
   }
-
   function _renderSelectList(items, targetName) {
-    var el = document.createElement('select');
-    el.classList.add('ui-timepicker-select');
-
+    var el = document.createElement("select");
+    el.classList.add("ui-timepicker-select");
     if (targetName) {
-      el.name = 'ui-timepicker-' + targetName;
+      el.name = "ui-timepicker-" + targetName;
     }
-
     var _iterator3 = _createForOfIteratorHelper(items),
-        _step3;
-
+      _step3;
     try {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var item = _step3.value;
-
         var itemEl = _renderSelectItem(item);
-
         el.appendChild(itemEl);
       }
     } catch (err) {
@@ -1241,24 +1071,19 @@
     } finally {
       _iterator3.f();
     }
-
     return el;
   }
-
   function renderHtml(tp) {
     var items = [].concat(_getNoneOptionItems(tp.settings), _getDropdownTimes(tp));
     var el;
-
     if (tp.settings.useSelect) {
       el = _renderSelectList(items, tp.targetEl.name);
     } else {
       el = _renderStandardList(items);
     }
-
     if (tp.settings.className) {
-      var _iterator4 = _createForOfIteratorHelper(tp.settings.className.split(' ')),
-          _step4;
-
+      var _iterator4 = _createForOfIteratorHelper(tp.settings.className.split(" ")),
+        _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var token = _step4.value;
@@ -1270,12 +1095,10 @@
         _iterator4.f();
       }
     }
-
     if (tp.settings.showDuration && (tp.settings.minTime !== null || tp.settings.durationTime !== null)) {
       el.classList.add("ui-timepicker-with-duration");
       el.classList.add("ui-timepicker-step-" + tp.settings.step());
     }
-
     return el;
   }
 
@@ -1300,29 +1123,23 @@
           settings.lang;
           this.timepickerObj = tp;
           self.addClass("ui-timepicker-input");
-
           if (settings.useSelect) {
             _render(self);
           } else {
             self.prop("autocomplete", "off");
-
             if (settings.showOn) {
               for (var i in settings.showOn) {
                 self.on(settings.showOn[i] + ".timepicker", methods.show);
               }
             }
-
             self.on("change.timepicker", tp._handleFormatValue);
             self.on("keydown.timepicker", _keydownhandler);
             self.on("keyup.timepicker", tp._handleKeyUp);
-
             if (settings.disableTextInput) {
               self.on("keydown.timepicker", tp._disableTextInputHandler);
             }
-
             self.on("cut.timepicker", tp._handleKeyUp);
             self.on("paste.timepicker", tp._handleKeyUp);
-
             tp._formatValue(null, "initial");
           }
         });
@@ -1331,53 +1148,44 @@
         var self = $(this);
         var tp = self[0].timepickerObj;
         var settings = tp.settings;
-
         if (e) {
           e.preventDefault();
         }
-
         if (settings.useSelect) {
-          tp.list.trigger('focus');
+          tp.list.trigger("focus");
           return;
         }
-
         if (tp._hideKeyboard()) {
           // block the keyboard on mobile devices
-          self.trigger('blur');
+          self.trigger("blur");
         }
+        var list = tp.list;
 
-        var list = tp.list; // check if input is readonly
-
+        // check if input is readonly
         if (self.prop("readonly")) {
           return;
-        } // check if list needs to be rendered
-
+        }
 
+        // check if list needs to be rendered
         _render(self);
-
         list = tp.list;
-
         if (Timepicker.isVisible(list)) {
           return;
         }
-
-        if (self.is('input')) {
+        if (self.is("input")) {
           tp.selectedValue = self.val();
         }
+        tp._setSelected();
 
-        tp._setSelected(); // make sure other pickers are hidden
-
-
+        // make sure other pickers are hidden
         Timepicker.hideAll();
-
         if (typeof settings.listWidth == "number") {
           list.width(self.outerWidth() * settings.listWidth);
-        } // position the dropdown relative to the input
-
+        }
 
+        // position the dropdown relative to the input
         list.show();
         var listOffset = {};
-
         if (settings.orientation.match(/r/)) {
           // right-align the dropdown
           listOffset.left = self.offset().left + self.outerWidth() - list.outerWidth() + parseInt(list.css("marginLeft").replace("px", ""), 10);
@@ -1388,9 +1196,7 @@
           // center-align the dropdown
           listOffset.left = self.offset().left + (self.outerWidth() - list.outerWidth()) / 2 + parseInt(list.css("marginLeft").replace("px", ""), 10);
         }
-
         var verticalOrientation;
-
         if (settings.orientation.match(/t/)) {
           verticalOrientation = "t";
         } else if (settings.orientation.match(/b/)) {
@@ -1400,7 +1206,6 @@
         } else {
           verticalOrientation = "b";
         }
-
         if (verticalOrientation == "t") {
           // position the dropdown on top
           list.addClass("ui-timepicker-positioned-top");
@@ -1410,60 +1215,53 @@
           list.removeClass("ui-timepicker-positioned-top");
           listOffset.top = self.offset().top + self.outerHeight() + parseInt(list.css("marginTop").replace("px", ""), 10);
         }
+        list.offset(listOffset);
 
-        list.offset(listOffset); // position scrolling
-
+        // position scrolling
         var selected = list.find(".ui-timepicker-selected");
-
         if (!selected.length) {
           var timeInt = tp.anytime2int(tp._getTimeValue());
-
           if (timeInt !== null) {
             selected = $(tp._findRow(timeInt));
           } else if (settings.scrollDefault()) {
             selected = $(tp._findRow(settings.scrollDefault()));
           }
-        } // if not found or disabled, intelligently find first selectable element
-
+        }
 
+        // if not found or disabled, intelligently find first selectable element
         if (!selected.length || selected.hasClass("ui-timepicker-disabled")) {
           selected = list.find("li:not(.ui-timepicker-disabled):first");
         }
-
         if (selected && selected.length) {
           var topOffset = list.scrollTop() + selected.position().top - selected.outerHeight();
           list.scrollTop(topOffset);
         } else {
           list.scrollTop(0);
-        } // prevent scroll propagation
-
+        }
 
+        // prevent scroll propagation
         if (settings.stopScrollPropagation) {
           $(document).on("wheel.ui-timepicker", ".ui-timepicker-wrapper", function (e) {
             e.preventDefault();
             var currentScroll = $(this).scrollTop();
             $(this).scrollTop(currentScroll + e.originalEvent.deltaY);
           });
-        } // attach close handlers
-
+        }
 
+        // attach close handlers
         $(document).on("mousedown.ui-timepicker", _closeHandler);
-        window.addEventListener('resize', _closeHandler);
-
+        window.addEventListener("resize", _closeHandler);
         if (settings.closeOnScroll) {
           $(settings.closeOnScroll).on("scroll.ui-timepicker", _closeHandler);
         }
-
         self.trigger("showTimepicker");
         return this;
       },
       hide: function hide(e) {
         var tp = this[0].timepickerObj;
-
         if (tp) {
           tp.hideMe();
         }
-
         Timepicker.hideAll();
         return this;
       },
@@ -1472,31 +1270,25 @@
           var tp = this[0].timepickerObj;
           return tp.settings[key];
         }
-
         return this.each(function () {
           var self = $(this);
           var tp = self[0].timepickerObj;
           var settings = tp.settings;
           var list = tp.list;
-
           if (_typeof(key) == "object") {
             settings = $.extend(settings, key);
           } else if (typeof key == "string") {
             settings[key] = value;
           }
-
           settings = tp.parseSettings(settings);
           tp.settings = settings;
-
           tp._formatValue({
             type: "change"
           }, "initial");
-
           if (list) {
             list.remove();
             tp.list = null;
           }
-
           if (settings.useSelect) {
             _render(self);
           }
@@ -1508,24 +1300,19 @@
       },
       getTime: function getTime(relative_date) {
         var tp = this[0].timepickerObj;
-
         var time_string = tp._getTimeValue();
-
         if (!time_string) {
           return null;
         }
-
         var offset = tp.anytime2int(time_string);
-
         if (offset === null) {
           return null;
         }
-
         if (!relative_date) {
           relative_date = new Date();
-        } // construct a Date from relative date, and offset's time
-
+        }
 
+        // construct a Date from relative date, and offset's time
         var time = new Date(relative_date);
         time.setHours(offset / 3600);
         time.setMinutes(offset % 3600 / 60);
@@ -1541,113 +1328,120 @@
         var tp = this[0].timepickerObj;
         var settings = tp.settings;
         var seconds = tp.anytime2int(value);
-
         if (tp._isTimeRangeError(seconds, settings)) {
-          var timeRangeErrorEvent = new CustomEvent('timeRangeError', EVENT_DEFAULTS);
+          var timeRangeErrorEvent = new CustomEvent("timeRangeError", EVENT_DEFAULTS);
           tp.targetEl.dispatchEvent(timeRangeErrorEvent);
         }
-
         if (settings.forceRoundTime) {
           var prettyTime = tp._roundAndFormatTime(seconds);
         } else {
           var prettyTime = tp._int2time(seconds);
         }
-
         if (value && prettyTime === null && settings.noneOption) {
           prettyTime = value;
         }
-
         tp._setTimeValue(prettyTime, "initial");
-
         tp._formatValue({
           type: "change"
         }, "initial");
-
         if (tp && tp.list) {
           tp._setSelected();
         }
-
         return this;
       },
       remove: function remove() {
-        var self = this; // check if this element is a timepicker
+        var self = this;
 
+        // check if this element is a timepicker
         if (!self.hasClass("ui-timepicker-input")) {
           return;
         }
-
         var tp = self[0].timepickerObj;
         var settings = tp.settings;
         self.removeAttr("autocomplete", "off");
         self.removeClass("ui-timepicker-input");
         self.removeData("timepicker-obj");
-        self.off(".timepicker"); // timepicker-list won't be present unless the user has interacted with this timepicker
+        self.off(".timepicker");
 
+        // timepicker-list won't be present unless the user has interacted with this timepicker
         if (tp.list) {
           tp.list.remove();
         }
-
         if (settings.useSelect) {
           self.show();
         }
-
+        if (tp.requiredMoved) {
+          self.prop("required", true);
+        }
         tp.list = null;
         return this;
       }
-    }; // private methods
+    };
+
+    // private methods
 
     function _render(self) {
       var tp = self[0].timepickerObj;
       var list = tp.list;
       var settings = tp.settings;
-
       if (list && list.length) {
         list.remove();
         tp.list = null;
       }
-
       var wrapped_list = $(renderHtml(tp));
-
       if (settings.useSelect) {
         list = wrapped_list;
       } else {
-        list = wrapped_list.children('ul');
+        list = wrapped_list.children("ul");
       }
-
       wrapped_list.data("timepicker-input", self);
       tp.list = wrapped_list;
-
       if (settings.useSelect) {
         if (self.val()) {
-          list.val(tp._roundAndFormatTime(tp.anytime2int(self.val())));
+          list.val(settings.roundingFunction(tp.anytime2int(self.val()), settings));
+        } else {
+          // don't let the browser default to the first time; this selects a
+          // noneOption with an empty value, or nothing if there isn't one
+          list.val("");
         }
-
         list.on("focus", function () {
           $(this).data("timepicker-input").trigger("showTimepicker");
         });
         list.on("blur", function () {
           $(this).data("timepicker-input").trigger("hideTimepicker");
         });
+        // time options hold seconds; noneOption values pass through as-is
+        var selectedTime = function selectedTime() {
+          var value = list.val();
+          var seconds = parseInt(value);
+          return isNaN(seconds) ? value : tp._int2time(seconds);
+        };
         list.on("change", function () {
-          tp._setTimeValue($(this).val(), "select");
+          tp._setTimeValue(selectedTime(), "select");
         });
 
-        tp._setTimeValue(list.val(), "initial");
+        // the input gets hidden, and a hidden required field blocks
+        // submission without showing an error, so the select takes it over
+        if (self.prop("required")) {
+          tp.requiredMoved = true;
+          self.prop("required", false);
+        }
+        list.prop("required", !!tp.requiredMoved);
 
+        // a value that isn't in the list leaves the select blank; keep the
+        // input's value instead of overwriting it with nothing
+        var initialTime = list.val() === null ? self.val() : selectedTime();
+        tp._setTimeValue(initialTime, "initial");
         self.hide().after(list);
       } else {
         var appendTo = settings.appendTo;
-
         if (typeof appendTo === "string") {
           appendTo = $(appendTo);
         } else if (typeof appendTo === "function") {
           appendTo = appendTo(self);
         }
-
         appendTo.append(wrapped_list);
-
         tp._setSelected();
-
         list.on("mousedown click", "li", function (e) {
           // hack: temporarily disable the focus handler
           // to deal with the fact that IE fires 'focus'
@@ -1657,15 +1451,13 @@
             self.off("focus.timepicker-ie-hack");
             self.on("focus.timepicker", methods.show);
           });
-
           if (!tp._hideKeyboard()) {
             self[0].focus();
-          } // make sure only the clicked row is selected
-
+          }
 
+          // make sure only the clicked row is selected
           list.find("li").removeClass("ui-timepicker-selected");
           $(this).addClass("ui-timepicker-selected");
-
           if (tp._selectValue()) {
             self.trigger("hideTimepicker");
             list.on("mouseup.timepicker click.timepicker", "li", function (e) {
@@ -1675,50 +1467,43 @@
           }
         });
       }
-    } // event handler to decide whether to close timepicker
-
+    }
 
+    // event handler to decide whether to close timepicker
     function _closeHandler(e) {
-      if (e.type == 'focus' && e.target == window) {
+      if (e.type == "focus" && e.target == window) {
         // mobile Chrome fires focus events against window for some reason
         return;
       }
-
       var target = $(e.target);
-
       if (target.closest(".ui-timepicker-input").length || target.closest(".ui-timepicker-wrapper").length) {
         // active timepicker was focused. ignore
         return;
       }
-
       Timepicker.hideAll();
       $(document).off(".ui-timepicker");
       $(window).off(".ui-timepicker");
     }
+
     /*
      *  Keyboard navigation via arrow keys
      */
-
-
     function _keydownhandler(e) {
       var self = $(this);
       var tp = self[0].timepickerObj;
       var list = tp.list;
-
       if (!list || !Timepicker.isVisible(list)) {
         if (e.keyCode == 40) {
           // show the list!
           methods.show.call(self.get(0));
           list = tp.list;
-
           if (!tp._hideKeyboard()) {
-            self.trigger('focus');
+            self.trigger("focus");
           }
         } else {
           return true;
         }
       }
-
       switch (e.keyCode) {
         case 13:
           // return
@@ -1726,17 +1511,13 @@
             tp._formatValue({
               type: "change"
             });
-
             tp.hideMe();
           }
-
           e.preventDefault();
           return false;
-
         case 38:
           // up
           var selected = list.find(".ui-timepicker-selected");
-
           if (!selected.length) {
             list.find("li").each(function (i, obj) {
               if ($(obj).position().top > 0) {
@@ -1748,18 +1529,14 @@
           } else if (!selected.is(":first-child")) {
             selected.removeClass("ui-timepicker-selected");
             selected.prev().addClass("ui-timepicker-selected");
-
             if (selected.prev().position().top < selected.outerHeight()) {
               list.scrollTop(list.scrollTop() - selected.outerHeight());
             }
           }
-
           return false;
-
         case 40:
           // down
           selected = list.find(".ui-timepicker-selected");
-
           if (selected.length === 0) {
             list.find("li").each(function (i, obj) {
               if ($(obj).position().top > 0) {
@@ -1771,50 +1548,43 @@
           } else if (!selected.is(":last-child")) {
             selected.removeClass("ui-timepicker-selected");
             selected.next().addClass("ui-timepicker-selected");
-
             if (selected.next().position().top + 2 * selected.outerHeight() > list.outerHeight()) {
               list.scrollTop(list.scrollTop() + selected.outerHeight());
             }
           }
-
           return false;
-
         case 27:
           // escape
           list.find("li").removeClass("ui-timepicker-selected");
           tp.hideMe();
           break;
-
         case 9:
           //tab
           tp.hideMe();
           break;
-
         default:
           return true;
       }
-    } // Plugin entry
-
+    }
 
+    // Plugin entry
     $.fn.timepicker = function (method) {
       if (!this.length) return this;
-
       if (methods[method]) {
         // check if this element is a timepicker
         if (!this.hasClass("ui-timepicker-input")) {
           return this;
         }
-
         return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
       } else if (_typeof(method) === "object" || !method) {
         return methods.init.apply(this, arguments);
       } else {
         $.error("Method " + method + " does not exist on jQuery.timepicker");
       }
-    }; // Default plugin options.
-
+    };
 
+    // Default plugin options.
     $.fn.timepicker.defaults = DEFAULT_SETTINGS;
   });
 
-}());
+})();