fix datepicker noconflict

2013-06-23 18:03:37 +04:00
parent 9136f8d34a
commit b1e96ef177
2 changed files with 9 additions and 4 deletions
--- a/src/inputs/date/date.js
+++ b/src/inputs/date/date.js
@@ -27,7 +27,10 @@ $(function(){
    "use strict";
    
    //store bootstrap-datepicker as bdateicker to exclude conflict with jQuery UI one
-    $.fn.bdatepicker = $.fn.datepicker.noConflict();    
+    $.fn.bdatepicker = $.fn.datepicker.noConflict();
+    if(!$.fn.datepicker) { //if there were no other datepickers, keep also original name
+        $.fn.datepicker = $.fn.bdatepicker;    
+    }    
    
    var Date = function (options) {
        this.init('date', options, Date.defaults);