Skip to content

Commit

Permalink
update to 5.0.0-alpha10
Browse files Browse the repository at this point in the history
  • Loading branch information
Eonasdan committed Dec 15, 2017
1 parent 763ef2a commit d480f66
Show file tree
Hide file tree
Showing 41 changed files with 1,419 additions and 1,458 deletions.
35 changes: 0 additions & 35 deletions bower.json

This file was deleted.

26 changes: 13 additions & 13 deletions build/css/tempusdominus-bootstrap-4.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*@preserve
* Tempus Dominus Bootstrap4 v5.0.0-alpha8 (https://tempusdominus.github.io/bootstrap-4/)
* Tempus Dominus Bootstrap4 v5.0.0-alpha9 (https://tempusdominus.github.io/bootstrap-4/)
* Copyright 2016-2017 Jonathan Peterson
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -126,7 +126,7 @@
width: 145px; }
.bootstrap-datetimepicker-widget table th.disabled, .bootstrap-datetimepicker-widget table th.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget table th.prev::after {
content: "Previous Month"; }
Expand All @@ -135,7 +135,7 @@
.bootstrap-datetimepicker-widget table thead tr:first-child th {
cursor: pointer; }
.bootstrap-datetimepicker-widget table thead tr:first-child th:hover {
background: #eceeef; }
background: #e9ecef; }
.bootstrap-datetimepicker-widget table td {
height: 54px;
line-height: 54px;
Expand All @@ -144,37 +144,37 @@
font-size: .8em;
height: 20px;
line-height: 20px;
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td.day {
height: 20px;
line-height: 20px;
width: 20px; }
.bootstrap-datetimepicker-widget table td.day:hover, .bootstrap-datetimepicker-widget table td.hour:hover, .bootstrap-datetimepicker-widget table td.minute:hover, .bootstrap-datetimepicker-widget table td.second:hover {
background: #eceeef;
background: #e9ecef;
cursor: pointer; }
.bootstrap-datetimepicker-widget table td.old, .bootstrap-datetimepicker-widget table td.new {
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td.today {
position: relative; }
.bootstrap-datetimepicker-widget table td.today:before {
content: '';
display: inline-block;
border: solid transparent;
border-width: 0 0 7px 7px;
border-bottom-color: #0275d8;
border-bottom-color: #007bff;
border-top-color: rgba(0, 0, 0, 0.2);
position: absolute;
bottom: 4px;
right: 4px; }
.bootstrap-datetimepicker-widget table td.active, .bootstrap-datetimepicker-widget table td.active:hover {
background-color: #0275d8;
background-color: #007bff;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); }
.bootstrap-datetimepicker-widget table td.active.today:before {
border-bottom-color: #fff; }
.bootstrap-datetimepicker-widget table td.disabled, .bootstrap-datetimepicker-widget table td.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget table td span {
display: inline-block;
Expand All @@ -185,16 +185,16 @@
cursor: pointer;
border-radius: 0.25rem; }
.bootstrap-datetimepicker-widget table td span:hover {
background: #eceeef; }
background: #e9ecef; }
.bootstrap-datetimepicker-widget table td span.active {
background-color: #0275d8;
background-color: #007bff;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); }
.bootstrap-datetimepicker-widget table td span.old {
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td span.disabled, .bootstrap-datetimepicker-widget table td span.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget.usetwentyfour td.hour {
height: 27px;
Expand Down
26 changes: 13 additions & 13 deletions build/css/tempusdominus-bootstrap-4.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*@preserve
* Tempus Dominus Bootstrap4 v5.0.0-alpha8 (https://tempusdominus.github.io/bootstrap-4/)
* Tempus Dominus Bootstrap4 v5.0.0-alpha9 (https://tempusdominus.github.io/bootstrap-4/)
* Copyright 2016-2017 Jonathan Peterson
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -126,7 +126,7 @@
width: 145px; }
.bootstrap-datetimepicker-widget table th.disabled, .bootstrap-datetimepicker-widget table th.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget table th.prev::after {
content: "Previous Month"; }
Expand All @@ -135,7 +135,7 @@
.bootstrap-datetimepicker-widget table thead tr:first-child th {
cursor: pointer; }
.bootstrap-datetimepicker-widget table thead tr:first-child th:hover {
background: #eceeef; }
background: #e9ecef; }
.bootstrap-datetimepicker-widget table td {
height: 54px;
line-height: 54px;
Expand All @@ -144,37 +144,37 @@
font-size: .8em;
height: 20px;
line-height: 20px;
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td.day {
height: 20px;
line-height: 20px;
width: 20px; }
.bootstrap-datetimepicker-widget table td.day:hover, .bootstrap-datetimepicker-widget table td.hour:hover, .bootstrap-datetimepicker-widget table td.minute:hover, .bootstrap-datetimepicker-widget table td.second:hover {
background: #eceeef;
background: #e9ecef;
cursor: pointer; }
.bootstrap-datetimepicker-widget table td.old, .bootstrap-datetimepicker-widget table td.new {
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td.today {
position: relative; }
.bootstrap-datetimepicker-widget table td.today:before {
content: '';
display: inline-block;
border: solid transparent;
border-width: 0 0 7px 7px;
border-bottom-color: #0275d8;
border-bottom-color: #007bff;
border-top-color: rgba(0, 0, 0, 0.2);
position: absolute;
bottom: 4px;
right: 4px; }
.bootstrap-datetimepicker-widget table td.active, .bootstrap-datetimepicker-widget table td.active:hover {
background-color: #0275d8;
background-color: #007bff;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); }
.bootstrap-datetimepicker-widget table td.active.today:before {
border-bottom-color: #fff; }
.bootstrap-datetimepicker-widget table td.disabled, .bootstrap-datetimepicker-widget table td.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget table td span {
display: inline-block;
Expand All @@ -185,16 +185,16 @@
cursor: pointer;
border-radius: 0.25rem; }
.bootstrap-datetimepicker-widget table td span:hover {
background: #eceeef; }
background: #e9ecef; }
.bootstrap-datetimepicker-widget table td span.active {
background-color: #0275d8;
background-color: #007bff;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); }
.bootstrap-datetimepicker-widget table td span.old {
color: #636c72; }
color: #868e96; }
.bootstrap-datetimepicker-widget table td span.disabled, .bootstrap-datetimepicker-widget table td span.disabled:hover {
background: none;
color: #636c72;
color: #868e96;
cursor: not-allowed; }
.bootstrap-datetimepicker-widget.usetwentyfour td.hour {
height: 27px;
Expand Down
28 changes: 14 additions & 14 deletions build/js/tempusdominus-bootstrap-4.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*@preserve
* Tempus Dominus Bootstrap4 v5.0.0-alpha8 (https://tempusdominus.github.io/bootstrap-4/)
* Tempus Dominus Bootstrap4 v5.0.0-alpha9 (https://tempusdominus.github.io/bootstrap-4/)
* Copyright 2016-2017 Jonathan Peterson
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -38,7 +38,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

// ReSharper disable once InconsistentNaming
var DateTimePicker = function ($) {
var DateTimePicker = function ($, moment) {
// ReSharper disable InconsistentNaming
var NAME = 'datetimepicker',
VERSION = '5.0.0-alpha7',
Expand Down Expand Up @@ -75,7 +75,7 @@ var DateTimePicker = function ($) {
maxDate: false,
useCurrent: true,
collapse: true,
locale: window.moment.locale(),
locale: moment.locale(),
defaultDate: false,
disabledDates: false,
enabledDates: false,
Expand Down Expand Up @@ -380,9 +380,9 @@ var DateTimePicker = function ($) {
this._initFormatting();

if (this.input !== undefined && this.input.is('input') && this.input.val().trim().length !== 0) {
this._setValue(this._parseInputDate(this.input.val().trim()));
this._setValue(this._parseInputDate(this.input.val().trim()), 0);
} else if (this._options.defaultDate && this.input !== undefined && this.input.attr('placeholder') === undefined) {
this._setValue(this._options.defaultDate);
this._setValue(this._options.defaultDate, 0);
}
if (this._options.inline) {
this.show();
Expand Down Expand Up @@ -499,7 +499,7 @@ var DateTimePicker = function ($) {
};

DateTimePicker.prototype._hasTimeZone = function _hasTimeZone() {
return window.moment.tz !== undefined && this._options.timeZone !== undefined && this._options.timeZone !== null && this._options.timeZone !== '';
return moment.tz !== undefined && this._options.timeZone !== undefined && this._options.timeZone !== null && this._options.timeZone !== '';
};

DateTimePicker.prototype._isEnabled = function _isEnabled(granularity) {
Expand Down Expand Up @@ -638,7 +638,7 @@ var DateTimePicker = function ($) {

DateTimePicker.prototype._parseInputDate = function _parseInputDate(inputDate) {
if (this._options.parseInputDate === undefined) {
if (!window.moment.isMoment(inputDate)) {
if (!moment.isMoment(inputDate)) {
inputDate = this.getMoment(inputDate);
}
} else {
Expand Down Expand Up @@ -782,13 +782,13 @@ var DateTimePicker = function ($) {
var returnMoment = void 0;

if (d === undefined || d === null) {
returnMoment = window.moment(); //TODO should this use format? and locale?
returnMoment = moment(); //TODO should this use format? and locale?
} else if (this._hasTimeZone()) {
// There is a string to parse and a default time zone
// parse with the tz function which takes a default time zone if it is not in the format string
returnMoment = window.moment.tz(d, this.parseFormats, this._options.useStrict, this._options.timeZone);
returnMoment = moment.tz(d, this.parseFormats, this._options.useStrict, this._options.timeZone);
} else {
returnMoment = window.moment(d, this.parseFormats, this._options.useStrict);
returnMoment = moment(d, this.parseFormats, this._options.useStrict);
}

if (this._hasTimeZone()) {
Expand Down Expand Up @@ -842,7 +842,7 @@ var DateTimePicker = function ($) {
}
}

if (newDate !== null && typeof newDate !== 'string' && !window.moment.isMoment(newDate) && !(newDate instanceof Date)) {
if (newDate !== null && typeof newDate !== 'string' && !moment.isMoment(newDate) && !(newDate instanceof Date)) {
throw new TypeError('date() parameter must be one of [null, string, moment or Date]');
}

Expand Down Expand Up @@ -1093,7 +1093,7 @@ var DateTimePicker = function ($) {
return this._options.locale;
}

if (!window.moment.localeData(_locale)) {
if (!moment.localeData(_locale)) {
throw new TypeError('locale() locale ' + _locale + ' is not loaded from moment locales!');
}

Expand Down Expand Up @@ -1465,7 +1465,7 @@ var DateTimePicker = function ($) {
return true;
}

if (typeof newDate !== 'string' && !window.moment.isMoment(newDate) && !(newDate instanceof Date)) {
if (typeof newDate !== 'string' && !moment.isMoment(newDate) && !(newDate instanceof Date)) {
throw new TypeError('viewDate() parameter must be one of [string, moment or Date]');
}

Expand Down Expand Up @@ -1584,7 +1584,7 @@ var DateTimePicker = function ($) {
}();

return DateTimePicker;
}(jQuery);
}(jQuery, moment);

//noinspection JSUnusedGlobalSymbols
/* global DateTimePicker */
Expand Down
6 changes: 3 additions & 3 deletions build/js/tempusdominus-bootstrap-4.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tempusdominus-bootstrap-4",
"version": "5.0.0-alpha9",
"version": "5.0.0-alpha10",
"main": "build/js/tempusdominus-bootstrap-4.min.js",
"scripts": [ "build/js/tempusdominus-bootstrap-4.min.js" ],
"styles": [ "build/css/tempusdominus-bootstrap-4.min.css" ],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tempusdominus/bootstrap-4",
"type": "component",
"version": "5.0.0-alpha9",
"version": "5.0.0-alpha10",
"description": "Date/time picker widget based on twitter bootstrap",
"keywords": [
"bootstrap",
Expand Down
Loading

0 comments on commit d480f66

Please sign in to comment.