#531

clevertech · Apr 28, 2014 · 09ff2ed · 09ff2ed
1 parent 0d7d182
commit 09ff2ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/assets/bootstrap-datepicker/js/bootstrap-datepicker-noconflict.js b/src/assets/bootstrap-datepicker/js/bootstrap-datepicker-noconflict.js
@@ -0,0 +1,5 @@
+var bootstrapDatePicker;
+
+(function ($) {
+	bootstrapDatePicker = $.fn.datepicker;
+})(jQuery);
diff --git a/src/assets/js/jquery-ui-no-conflict.min.js b/src/assets/js/jquery-ui-no-conflict.min.js
diff --git a/src/components/packages.php b/src/components/packages.php
@@ -52,7 +52,8 @@
 		'depends' => array('jquery'),
 		'baseUrl' => $this->enableCdn ? '//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.2.0/' : $this->getAssetsUrl() . '/bootstrap-datepicker/',
 		'css' => array($this->minify ? 'css/datepicker.min.css' : 'css/datepicker.css'),
-		'js' => array($this->minify ? 'js/bootstrap-datepicker.min.js' : 'js/bootstrap-datepicker.js')
+		'js' => array($this->minify ? 'js/bootstrap-datepicker.min.js' : 'js/bootstrap-datepicker.js', 'js/bootstrap-datepicker-noconflict.js') 
+		// ... the noconflict code is in its own file so we do not want to touch the original js files to ease upgrading lib
 	),
 	'datetimepicker' => array(
 		'depends' => array('jquery'),