github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable noconflict for Bootstrap Datepicker. Closes #1346

Browse Source
This commit is contained in:
Winston Chang
2016-09-16 14:16:05 -05:00
parent c62e6b5734
commit 2a9a7cc897
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
srcjs/input_binding_date.js
View File

@@ -16,7 +16,7 @@ $.extend(dateInputBinding, {
setValue: function(el, value) {
// R's NA, which is null here will remove current value
if (value === null) {
$(el).find('input').val('').datepicker('update');
$(el).find('input').val('').bootstrapDP('update');
return;
}
@@ -25,7 +25,7 @@ $.extend(dateInputBinding, {
if (isNaN(date))
return;
$(el).find('input').datepicker('update', date);
$(el).find('input').bootstrapDP('update', date);
},
getState: function(el) {
var $el = $(el);
@@ -127,24 +127,24 @@ $.extend(dateInputBinding, {
// null will unset.
_setMin: function(el, date) {
if (date === null) {
$(el).datepicker('setStartDate', null);
$(el).bootstrapDP('setStartDate', null);
} else {
date = this._newDate(date);
if (!isNaN(date))
$(el).datepicker('setStartDate', date);
$(el).bootstrapDP('setStartDate', date);
}
},
// Given an unambiguous date string or a Date object, set the max (end) date
// null will unset.
_setMax: function(el, date) {
if (date === null) {
$(el).datepicker('setEndDate', null);
$(el).bootstrapDP('setEndDate', null);
} else {
date = this._newDate(date);
if (!isNaN(date))
$(el).datepicker('setEndDate', date);
$(el).bootstrapDP('setEndDate', date);
}
},
// Given a date string of format yyyy-mm-dd, return a Date object with