Updating to 4.15.35.

Author: TrevorS

README.md

@@ -14,7 +14,7 @@ actively maintained and works with [Bootstrap3](http://getbootstrap.com).
 Add these lines to your application's Gemfile:
 ```ruby
 gem 'momentjs-rails', '>= 2.9.0'
-gem 'bootstrap3-datetimepicker-rails', '~> 4.14.30'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.15.35'
 ```
 
 And then execute:

bootstrap-datetimepicker

@@ -1,5 +1,5 @@
 module Bootstrap3Datetimepicker
  module Rails
- VERSION = '4.14.30'
+ VERSION = '4.15.35'
  end
 end

lib/bootstrap3-datetimepicker-rails/version.rb

@@ -1,4 +1,4 @@
-/*! version : 4.14.30
+/*! version : 4.15.35
  =========================================================
  bootstrap-datetimejs
  https://github.com/Eonasdan/bootstrap-datetimepicker
@@ -285,16 +285,16 @@
  getToolbar = function () {
  var row = [];
  if (options.showTodayButton) {
- row.push($('<td>').append($('<a>').attr({'data-action':'today', 'title':'Go to today'}).append($('<span>').addClass(options.icons.today))));
+ row.push($('<td>').append($('<a>').attr({'data-action':'today', 'title': options.tooltips.today}).append($('<span>').addClass(options.icons.today))));
  }
  if (!options.sideBySide && hasDate() && hasTime()) {
  row.push($('<td>').append($('<a>').attr({'data-action':'togglePicker', 'title':'Select Time'}).append($('<span>').addClass(options.icons.time))));
  }
  if (options.showClear) {
- row.push($('<td>').append($('<a>').attr({'data-action':'clear', 'title':'Clear selection'}).append($('<span>').addClass(options.icons.clear))));
+ row.push($('<td>').append($('<a>').attr({'data-action':'clear', 'title': options.tooltips.clear}).append($('<span>').addClass(options.icons.clear))));
  }
  if (options.showClose) {
- row.push($('<td>').append($('<a>').attr({'data-action':'close', 'title':'Close the picker'}).append($('<span>').addClass(options.icons.close))));
+ row.push($('<td>').append($('<a>').attr({'data-action':'close', 'title': options.tooltips.close}).append($('<span>').addClass(options.icons.close))));
  }
  return $('<table>').addClass('table-condensed').append($('<tbody>').append($('<tr>').append(row)));
  },
@@ -316,14 +316,20 @@
  if (isEnabled('s') && !use24Hours) {
  template.addClass('wider');
  }
+
  if (options.sideBySide && hasDate() && hasTime()) {
  template.addClass('timepicker-sbs');
+ if (options.toolbarPlacement === 'top') {
+ template.append(toolbar);
+ }
  template.append(
  $('<div>').addClass('row')
- .append(dateView.addClass('col-sm-6'))
- .append(timeView.addClass('col-sm-6'))
+ .append(dateView.addClass('col-md-6'))
+ .append(timeView.addClass('col-md-6'))
  );
- template.append(toolbar);
+ if (options.toolbarPlacement === 'bottom') {
+ template.append(toolbar);
+ }
  return template;
  }
 
@@ -552,9 +558,9 @@
  monthsViewHeader = monthsView.find('th'),
  months = monthsView.find('tbody').find('span');
 
- monthsViewHeader.eq(0).find('span').attr('title', 'Previous Year');
- monthsViewHeader.eq(1).attr('title', 'Select Year');
- monthsViewHeader.eq(2).find('span').attr('title', 'Next Year');
+ monthsViewHeader.eq(0).find('span').attr('title', options.tooltips.prevYear);
+ monthsViewHeader.eq(1).attr('title', options.tooltips.selectYear);
+ monthsViewHeader.eq(2).find('span').attr('title', options.tooltips.nextYear);
 
  monthsView.find('.disabled').removeClass('disabled');
 
@@ -587,9 +593,9 @@
  endYear = viewDate.clone().add(6, 'y'),
  html = '';
 
- yearsViewHeader.eq(0).find('span').attr('title', 'Previous Decade');
- yearsViewHeader.eq(1).attr('title', 'Select Decade');
- yearsViewHeader.eq(2).find('span').attr('title', 'Next Decade');
+ yearsViewHeader.eq(0).find('span').attr('title', options.tooltips.nextDecade);
+ yearsViewHeader.eq(1).attr('title', options.tooltips.selectDecade);
+ yearsViewHeader.eq(2).find('span').attr('title', options.tooltips.prevDecade);
 
  yearsView.find('.disabled').removeClass('disabled');
 
@@ -618,8 +624,8 @@
  endDecade = startDecade.clone().add(100, 'y'),
  html = '';
 
- decadesViewHeader.eq(0).find('span').attr('title', 'Previous Century');
- decadesViewHeader.eq(2).find('span').attr('title', 'Next Century');
+ decadesViewHeader.eq(0).find('span').attr('title', options.tooltips.prevCentury);
+ decadesViewHeader.eq(2).find('span').attr('title', options.tooltips.nextCentury);
 
  decadesView.find('.disabled').removeClass('disabled');
 
@@ -656,9 +662,9 @@
  return;
  }
 
- daysViewHeader.eq(0).find('span').attr('title', 'Previous Month');
- daysViewHeader.eq(1).attr('title', 'Select Month');
- daysViewHeader.eq(2).find('span').attr('title', 'Next Month');
+ daysViewHeader.eq(0).find('span').attr('title', options.tooltips.prevMonth);
+ daysViewHeader.eq(1).attr('title', options.tooltips.selectMonth);
+ daysViewHeader.eq(2).find('span').attr('title', options.tooltips.nextMonth);
 
  daysView.find('.disabled').removeClass('disabled');
  daysViewHeader.eq(1).text(viewDate.format(options.dayViewHeaderFormat));
@@ -880,6 +886,9 @@
  type: 'dp.hide',
  date: date.clone()
  });
+
+ input.blur();
+
  return picker;
  },
 
@@ -1284,7 +1293,7 @@
  detachDatePickerElementEvents = function () {
  input.off({
  'change': change,
- 'blur': hide,
+ 'blur': blur,
  'keydown': keydown,
  'keyup': keyup,
  'focus': options.allowInputToggle ? hide : ''
@@ -1630,7 +1639,7 @@
  setValue(options.maxDate);
  }
  if (viewDate.isAfter(parsedDate)) {
- viewDate = parsedDate.clone();
+ viewDate = parsedDate.clone().subtract(options.stepping, 'm');
  }
  update();
  return picker;
@@ -1666,7 +1675,7 @@
  setValue(options.minDate);
  }
  if (viewDate.isBefore(parsedDate)) {
- viewDate = parsedDate.clone();
+ viewDate = parsedDate.clone().add(options.stepping, 'm');
  }
  update();
  return picker;
@@ -1798,6 +1807,22 @@
  return picker;
  };
 
+ picker.tooltips = function (tooltips) {
+ if (arguments.length === 0) {
+ return $.extend({}, options.tooltips);
+ }
+
+ if (!(tooltips instanceof Object)) {
+ throw new TypeError('tooltips() expects parameter to be an Object');
+ }
+ $.extend(options.tooltips, tooltips);
+ if (widget) {
+ hide();
+ show();
+ }
+ return picker;
+ };
+
  picker.useStrict = function (useStrict) {
  if (arguments.length === 0) {
  return options.useStrict;
@@ -2236,7 +2261,7 @@
  if (element.hasClass('input-group')) {
  // in case there is more then one 'input-group-addon' Issue #48
  if (element.find('.datepickerbutton').size() === 0) {
- component = element.find('[class^="input-group-"]');
+ component = element.find('.input-group-addon');
  } else {
  component = element.find('.datepickerbutton');
  }
@@ -2310,6 +2335,22 @@
  clear: 'glyphicon glyphicon-trash',
  close: 'glyphicon glyphicon-remove'
  },
+ tooltips: {
+ today: 'Go to today',
+ clear: 'Clear selection',
+ close: 'Close the picker',
+ selectMonth: 'Select Month',
+ prevMonth: 'Previous Month',
+ nextMonth: 'Next Month',
+ selectYear: 'Select Year',
+ prevYear: 'Previous Year',
+ nextYear: 'Next Year',
+ selectDecade: 'Select Decade',
+ prevDecade: 'Previous Decade',
+ nextDecade: 'Next Decade',
+ prevCentury: 'Previous Century',
+ nextCentury: 'Next Century'
+ },
  useStrict: false,
  sideBySide: false,
  daysOfWeekDisabled: false,
@@ -2339,7 +2380,7 @@
  if (widget.find('.datepicker').is(':visible')) {
  this.date(d.clone().subtract(7, 'd'));
  } else {
- this.date(d.clone().add(1, 'm'));
+ this.date(d.clone().add(this.stepping(), 'm'));
  }
  },
  down: function (widget) {
@@ -2351,7 +2392,7 @@
  if (widget.find('.datepicker').is(':visible')) {
  this.date(d.clone().add(7, 'd'));
  } else {
- this.date(d.clone().subtract(1, 'm'));
+ this.date(d.clone().subtract(this.stepping(), 'm'));
  }
  },
  'control up': function (widget) {

vendor/assets/javascripts/bootstrap-datetimepicker.js

@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap 3
- * version : 4.14.30
+ * version : 4.15.35
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 .bootstrap-datetimepicker-widget {
@@ -299,7 +299,8 @@
 .bootstrap-datetimepicker-widget table td.today:before {
  content: '';
  display: inline-block;
- border: 0 0 7px 7px solid transparent;
+ border: solid transparent;
+ border-width: 0 0 7px 7px;
  border-bottom-color: #337ab7;
  border-top-color: rgba(0, 0, 0, 0.2);
  position: absolute;