use noConflict of bootstrap-datepicker, fix #156

2013-06-13 07:38:16 +04:00
parent fd4a94e1ae
commit f8d8799fbc
6 changed files with 38 additions and 28 deletions
--- a/test/unit/date.js
+++ b/test/unit/date.js
@ -5,7 +5,7 @@ $(function () {
   module("date", {
        setup: function(){
            fx = $('#async-fixture');
-            dpg = $.fn.datepicker.DPGlobal;
+            dpg = $.fn.bdatepicker.DPGlobal;
            $.support.transition = false;
            mode = $.fn.editable.defaults.mode;
            $.fn.editable.defaults.mode = 'popup';