CRM-16154 - Use bower to load our Select2 fork
authorColeman Watts <coleman@civicrm.org>
Sun, 22 Mar 2015 17:56:05 +0000 (13:56 -0400)
committerColeman Watts <coleman@civicrm.org>
Sun, 22 Mar 2015 17:56:05 +0000 (13:56 -0400)
CRM/Core/Resources.php
bower.json

index 0c463d07e20265a6bba80464dd138a835ec03908..c49a26c0897d7d06a29e4199b3f725c03dc6d8f7 100644 (file)
@@ -701,8 +701,8 @@ class CRM_Core_Resources {
       "bower_components/jquery-ui/themes/smoothness/jquery-ui$min.css",
       "bower_components/lodash-compat/lodash.min.js",
       "packages/jquery/plugins/jquery.mousewheel$min.js",
-      "packages/jquery/plugins/select2/select2$min.js",
-      "packages/jquery/plugins/select2/select2.css",
+      "bower_components/select2/select2$min.js",
+      "bower_components/select2/select2.css",
       "packages/jquery/plugins/jquery.tableHeader.js",
       "packages/jquery/plugins/jquery.textarearesizer.js",
       "packages/jquery/plugins/jquery.form$min.js",
index 9bf883f363aee3af2a724edd4c9d17e2485e7db0..081516194ab47b133e104581ba64d94d7d5dcfd2 100644 (file)
@@ -18,7 +18,8 @@
     "jquery": "~1.11",
     "jquery-ui": "~1.11",
     "lodash-compat": "~3.0",
-    "google-code-prettify": "~1.0"
+    "google-code-prettify": "~1.0",
+    "select2": "colemanw/select2#stable/3.5"
   },
   "resolutions": {
     "angular": "~1.3.8"