Skip to content
This repository was archived by the owner on Dec 15, 2017. It is now read-only.

patch for both bootstrap 2 and 3 supports #192

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

patch for both bootstrap 2 and 3 supports #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/css/bootstrap-datetimepicker.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions src/js/bootstrap-datetimepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
(function($) {

// Picker object
var usev3 = false;
var smartPhone = (window.orientation != undefined);
var DateTimePicker = function(element, options) {
this.id = dpgId++;
Expand Down Expand Up @@ -66,16 +67,17 @@
if (this.component) {
icon = this.component.find('i');
}
usev3 = icon.parent().hasClass('input-group-addon');
if (this.pickTime) {
if (icon && icon.length) this.timeIcon = icon.data('time-icon');
if (!this.timeIcon) this.timeIcon = 'icon-time';
icon.addClass(this.timeIcon);
if (!this.timeIcon) this.timeIcon = (usev3?'glyph':'') + 'icon-time';
icon.addClass(this.timeIcon + (usev3?' glyphicon':''));
}
if (this.pickDate) {
if (icon && icon.length) this.dateIcon = icon.data('date-icon');
if (!this.dateIcon) this.dateIcon = 'icon-calendar';
if (!this.dateIcon) this.dateIcon = (usev3?'glyph':'') + 'icon-calendar';
icon.removeClass(this.timeIcon);
icon.addClass(this.dateIcon);
icon.addClass(this.dateIcon + (usev3?' glyphicon':''));
}
this.widget = $(getTemplate(this.timeIcon, options.pickDate, options.pickTime, options.pick12HourFormat, options.pickSeconds, options.collapse)).appendTo('body');
this.minViewMode = options.minViewMode||this.$element.data('date-minviewmode')||0;
Expand Down Expand Up @@ -963,7 +965,7 @@
e.stopPropagation();
var $this = $(this);
var $parent = $this.closest('ul');
var expanded = $parent.find('.collapse.in');
var expanded = $parent.find('.in');
var closed = $parent.find('.collapse:not(.in)');

if (expanded && expanded.length) {
Expand Down Expand Up @@ -1154,7 +1156,7 @@
DPGlobal.template +
'</div>' +
'</li>' +
'<li class="picker-switch accordion-toggle"><a><i class="' + timeIcon + '"></i></a></li>' +
'<li class="picker-switch accordion-toggle"><a'+(usev3?' class="btn btn-info" style="width:100%"':'')+'><i class="' + (usev3?'glyphicon ':'') + timeIcon + '"></i></a></li>' +
'<li' + (collapse ? ' class="collapse"' : '') + '>' +
'<div class="timepicker">' +
TPGlobal.getTemplate(is12Hours, showSeconds) +
Expand Down Expand Up @@ -1250,12 +1252,12 @@
(is12Hours ? ' data-hour-format="12"' : '') +
'>' +
'<tr>' +
'<td><a href="#" class="btn" data-action="incrementHours"><i class="icon-chevron-up"></i></a></td>' +
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="incrementHours"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-up"></i></a></td>' +
'<td class="separator"></td>' +
'<td><a href="#" class="btn" data-action="incrementMinutes"><i class="icon-chevron-up"></i></a></td>' +
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="incrementMinutes"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-up"></i></a></td>' +
(showSeconds ?
'<td class="separator"></td>' +
'<td><a href="#" class="btn" data-action="incrementSeconds"><i class="icon-chevron-up"></i></a></td>': '')+
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="incrementSeconds"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-up"></i></a></td>': '')+
(is12Hours ? '<td class="separator"></td>' : '') +
'</tr>' +
'<tr>' +
Expand All @@ -1272,12 +1274,12 @@
'</td>' : '') +
'</tr>' +
'<tr>' +
'<td><a href="#" class="btn" data-action="decrementHours"><i class="icon-chevron-down"></i></a></td>' +
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="decrementHours"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-down"></i></a></td>' +
'<td class="separator"></td>' +
'<td><a href="#" class="btn" data-action="decrementMinutes"><i class="icon-chevron-down"></i></a></td>' +
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="decrementMinutes"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-down"></i></a></td>' +
(showSeconds ?
'<td class="separator"></td>' +
'<td><a href="#" class="btn" data-action="decrementSeconds"><i class="icon-chevron-down"></i></a></td>': '') +
'<td><a href="#" class="btn'+(usev3?' btn-default':'')+'" data-action="decrementSeconds"><i class="'+(usev3?'glyphicon glyph':'')+'icon-chevron-down"></i></a></td>': '') +
(is12Hours ? '<td class="separator"></td>' : '') +
'</tr>' +
'</table>' +
Expand Down
1 change: 1 addition & 0 deletions src/less/bootstrap-datetimepicker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
>ul {
list-style-type: none;
margin: 0;
padding: 5px 0;
}
.timepicker-hour, .timepicker-minute, .timepicker-second {
width: 100%;
Expand Down