SCORM SCO-177 configure > date pickers don't appear (sakaiproject#59)

punkjoker · Apr 11, 2024 · 172a871 · 172a871
1 parent d3ac945
commit 172a871
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...cket-tool/src/java/org/sakaiproject/wicket/markup/html/datepicker/SakaiDateTimeField.java b/...cket-tool/src/java/org/sakaiproject/wicket/markup/html/datepicker/SakaiDateTimeField.java
@@ -88,7 +88,7 @@ protected void onInitialize()
 		setOutputMarkupId(true);
 		dateConverter = new SakaiIsoDateConverter(getMarkupId());
 
-		add(AttributeModifier.append("class", "form-control datepicker sakai-datetimefield"));
+		add(AttributeModifier.append("class", "sakai-datetimefield"));
 	}
 
 	@Override

diff --git a/...et-tool/src/java/org/sakaiproject/wicket/markup/html/datepicker/res/SakaiDateTimeField.js b/...et-tool/src/java/org/sakaiproject/wicket/markup/html/datepicker/res/SakaiDateTimeField.js
@@ -1,5 +1,12 @@
 function loadJQueryDatePicker(inputField, allowEmptyDate, value)
 {
+    if (typeof $.fn.button.noConflict === typeof Function)
+    {
+        // bootstrap has taken over the button() function, assign it back to jquery ui
+        // to resolve conflicts with the timepicker plugin
+        $.fn.button.noConflict();
+    }
+
     localDatePicker(
     {
         input: '#' + inputField,