From b1e96ef1774ee053d8eb1a143ff4a66df709fd8d Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Sun, 23 Jun 2013 18:03:37 +0400
Subject: [PATCH] fix datepicker noconflict
---
.../date/bootstrap-datepicker/js/bootstrap-datepicker.js | 8 +++++---
src/inputs/date/date.js | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/inputs/date/bootstrap-datepicker/js/bootstrap-datepicker.js b/src/inputs/date/bootstrap-datepicker/js/bootstrap-datepicker.js
index 0dbec7b..b644a70 100644
--- a/src/inputs/date/bootstrap-datepicker/js/bootstrap-datepicker.js
+++ b/src/inputs/date/bootstrap-datepicker/js/bootstrap-datepicker.js
@@ -958,7 +958,7 @@
}
var old = $.fn.datepicker;
- $.fn.datepicker = function ( option ) {
+ var datepicker = $.fn.datepicker = function ( option ) {
var args = Array.apply(null, arguments);
args.shift();
var internal_return,
@@ -1242,11 +1242,13 @@
if ($this.data('datepicker')) return;
e.preventDefault();
// component click requires us to explicitly show it
- $this.datepicker('show');
+ datepicker.call($this, 'show');
}
);
$(function(){
- $('[data-provide="datepicker-inline"]').datepicker();
+ //$('[data-provide="datepicker-inline"]').datepicker();
+ //vit: changed to support noConflict()
+ datepicker.call($('[data-provide="datepicker-inline"]'));
});
}( window.jQuery ));
diff --git a/src/inputs/date/date.js b/src/inputs/date/date.js
index b558a49..523f613 100644
--- 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);