tracer/x-editable-bs5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use noConflict of bootstrap-datepicker, fix #156

Browse Source
This commit is contained in:
vitalets
2013-06-13 07:38:16 +04:00
parent fd4a94e1ae
commit f8d8799fbc
6 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/inputs/date/date.js
View File

@@ -26,6 +26,9 @@ $(function(){
(function ($) {
"use strict";
//store bootstrap-datepicker as bdateicker to exclude conflict with jQuery UI one
$.fn.bdatepicker = $.fn.datepicker.noConflict();
var Date = function (options) {
this.init('date', options, Date.defaults);
this.initPicker(options, Date.defaults);
@@ -52,7 +55,7 @@ $(function(){
this.options.datepicker.language = this.options.datepicker.language || 'en';
//store DPglobal
this.dpg = $.fn.datepicker.DPGlobal;
this.dpg = $.fn.bdatepicker.DPGlobal;
//store parsed formats
this.parsedFormat = this.dpg.parseFormat(this.options.format);
@@ -60,7 +63,7 @@ $(function(){
},
render: function () {
this.$input.datepicker(this.options.datepicker);
this.$input.bdatepicker(this.options.datepicker);
//"clear" link
if(this.options.clear) {
@@ -96,7 +99,7 @@ $(function(){
},
value2input: function(value) {
this.$input.datepicker('update', value);
this.$input.bdatepicker('update', value);
},
input2value: function() {
@@ -198,4 +201,4 @@ $(function(){
$.fn.editabletypes.date = Date;
}(window.jQuery));
}(window.jQuery));