Updating to newest bootstrap-datetimepicker.

Author: TrevorS

bootstrap-datetimepicker

@@ -1,5 +1,5 @@
 module Bootstrap3Datetimepicker
  module Rails
- VERSION = '3.0.0.1'
+ VERSION = '3.0.0.2'
  end
 end

lib/bootstrap3-datetimepicker-rails/version.rb

@@ -44,7 +44,7 @@ THE SOFTWARE.
 
 (function ($, moment) {
  if (typeof moment === 'undefined') {
- alert("momentjs is requried");
+ alert("momentjs is required");
  throw new Error('momentjs is required');
  };
 
@@ -54,34 +54,14 @@ THE SOFTWARE.
 
 // ReSharper disable once InconsistentNaming
  DateTimePicker = function (element, options) {
- var defaults = {
- pickDate: true,
- pickTime: true,
- useMinutes: true,
- useSeconds: false,
- useCurrent: true,
- minuteStepping: 1,
- minDate: new pMoment({ y: 1900 }),
- maxDate: new pMoment().add(100, "y"),
- showToday: true,
- collapse: true,
- language: "en",
- defaultDate: "",
- disabledDates: false,
- enabledDates: false,
- icons: {},
- useStrict: false,
- direction: "auto",
- sideBySide: false,
- daysOfWeekDisabled: false
- },
+ var defaults = $.fn.datetimepicker.defaults,
 
-icons = {
- time: 'glyphicon glyphicon-time',
- date: 'glyphicon glyphicon-calendar',
- up: 'glyphicon glyphicon-chevron-up',
- down: 'glyphicon glyphicon-chevron-down'
-},
+icons = {
+ time: 'glyphicon glyphicon-time',
+ date: 'glyphicon glyphicon-calendar',
+ up: 'glyphicon glyphicon-chevron-up',
+ down: 'glyphicon glyphicon-chevron-down'
+},
 
  picker = this,
 
@@ -201,10 +181,19 @@ THE SOFTWARE.
  },
 
  getPickerInput = function () {
+ var input;
+
  if (picker.isInput) {
  return picker.element;
  } else {
- return dateStr = picker.element.find('input');
+ input = picker.element.find('.datepickerinput');
+ if (input.size() === 0) {
+ input = picker.element.find('input');
+ }
+ else if (!input.is('input')) {
+ throw new Error('CSS class "datepickerinput" cannot be applied to non input element');
+ }
+ return input;
  }
  },
 
@@ -318,7 +307,7 @@ THE SOFTWARE.
  pMoment.lang(picker.options.language);
  var dateStr = newDate;
  if (!dateStr) {
- dateStr = getPickerInput().val()
+ dateStr = getPickerInput().val();
  if (dateStr) picker.date = pMoment(dateStr, picker.format, picker.options.useStrict);
  if (!picker.date) picker.date = pMoment();
  }
@@ -356,6 +345,7 @@ THE SOFTWARE.
  },
 
  fillDate = function () {
+ if(!picker.options.pickDate) return;
  pMoment.lang(picker.options.language);
  var year = picker.viewDate.year(),
  month = picker.viewDate.month(),
@@ -398,7 +388,7 @@ THE SOFTWARE.
  if (prevMonth.isSame(pMoment({ y: picker.date.year(), M: picker.date.month(), d: picker.date.date() }))) {
  clsName += ' active';
  }
- if (isInDisableDates(prevMonth) || !isInEnableDates(prevMonth)) {
+ if (isInDisableDates(prevMonth, 'day') || !isInEnableDates(prevMonth)) {
  clsName += ' disabled';
  }
  if (picker.options.showToday === true) {
@@ -712,6 +702,11 @@ THE SOFTWARE.
  e.preventDefault();
  },
 
+keydown = function (e) {
+ if (e.keyCode === 27) // allow escape to hide picker
+ picker.hide();
+ },
+
  change = function (e) {
  pMoment.lang(picker.options.language);
  var input = $(e.target), oldDate = pMoment(picker.date), newDate = pMoment(input.val(), picker.format, picker.options.useStrict);
@@ -742,6 +737,7 @@ THE SOFTWARE.
  picker.widget.on('click', '.datepicker *', $.proxy(click, this)); // this handles date picker clicks
  picker.widget.on('click', '[data-action]', $.proxy(doAction, this)); // this handles time picker clicks
  picker.widget.on('mousedown', $.proxy(stopEvent, this));
+ picker.element.on('keydown', $.proxy(keydown, this));
  if (picker.options.pickDate && picker.options.pickTime) {
  picker.widget.on('click.togglePicker', '.accordion-toggle', function (e) {
  e.stopPropagation();
@@ -752,7 +748,7 @@ THE SOFTWARE.
 
  if (expanded && expanded.length) {
  collapseData = expanded.data('collapse');
- if (collapseData && collapseData.date - transitioning) return;
+ if (collapseData && collapseData.transitioning) return;
  expanded.collapse('hide');
  closed.collapse('show');
  $this.find('span').toggleClass(picker.options.icons.time + ' ' + picker.options.icons.date);
@@ -868,9 +864,17 @@ THE SOFTWARE.
  picker.unset = false;
 },
 
- isInDisableDates = function (date) {
+ isInDisableDates = function (date, timeUnit) {
  pMoment.lang(picker.options.language);
- if (date.isAfter(picker.options.maxDate) || date.isBefore(picker.options.minDate)) return true;
+ var maxDate = picker.options.maxDate;
+ var minDate = picker.options.minDate;
+ 
+ if(timeUnit) {
+ maxDate = pMoment(maxDate).endOf(timeUnit);
+ minDate = pMoment(minDate).startOf(timeUnit);
+ }
+
+ if (date.isAfter(maxDate) || date.isBefore(minDate)) return true;
  if (picker.options.disabledDates === false) {
  return false;
  }
@@ -1098,10 +1102,11 @@ THE SOFTWARE.
  var collapse = picker.widget.find('.collapse'), i, collapseData;
  for (i = 0; i < collapse.length; i++) {
  collapseData = collapse.eq(i).data('collapse');
- if (collapseData && collapseData.date - transitioning)
+ if (collapseData && collapseData.transitioning)
  return;
  }
  picker.widget.hide();
+ picker.widget.removeClass("picker-open");
  picker.viewMode = picker.startViewMode;
  showMode();
  picker.element.trigger({
@@ -1119,7 +1124,7 @@ THE SOFTWARE.
  } else {
  picker.unset = false;
  }
- if (!pMoment.isMoment(newDate)) newDate = pMoment(newDate, picker.format);
+ if (!pMoment.isMoment(newDate)) newDate = (newDate instanceof Date) ? pMoment(newDate) : pMoment(newDate, picker.format);
  if (newDate.isValid()) {
  picker.date = newDate;
  set();
@@ -1177,4 +1182,27 @@ THE SOFTWARE.
  if (!data) $this.data('DateTimePicker', new DateTimePicker(this, options));
  });
  };
+ 
+ $.fn.datetimepicker.defaults = {
+ pickDate: true,
+ pickTime: true,
+ useMinutes: true,
+ useSeconds: false,
+ useCurrent: true,
+ minuteStepping: 1,
+ minDate: new pMoment({ y: 1900 }),
+ maxDate: new pMoment().add(100, "y"),
+ showToday: true,
+ collapse: true,
+ language: "en",
+ defaultDate: "",
+ disabledDates: false,
+ enabledDates: false,
+ icons: {},
+ useStrict: false,
+ direction: "auto",
+ sideBySide: false,
+ daysOfWeekDisabled: false
+ };
+
 }));