Merge pull request #18696 from colemanw/btnNoConflict

Greenwich - fix conflict btw bootstrap & jQuery UI button
civicrm · Oct 7, 2020 · f50dbca · f50dbca
2 parents a6e5f04 + c99c68b
commit f50dbca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ext/greenwich/greenwich.php b/ext/greenwich/greenwich.php
@@ -56,6 +56,9 @@ function greenwich_civicrm_alterBundle(CRM_Core_Resources_Bundle $bundle) {
       $bundle->addScriptFile('greenwich', 'extern/bootstrap3/assets/javascripts/bootstrap.min.js', [
         'translate' => FALSE,
       ]);
+      $bundle->addScriptFile('greenwich', 'js/noConflict.js', [
+        'translate' => FALSE,
+      ]);
       break;
   }
 }
diff --git a/ext/greenwich/js/noConflict.js b/ext/greenwich/js/noConflict.js
@@ -0,0 +1,4 @@
+// https://civicrm.org/licensing
+(function($) {
+  $.fn.button.noConflict();
+})(jQuery);