From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 22 Mar 2015 17:56:05 +0000 (-0400)
Subject: CRM-16154 - Use bower to load our Select2 fork
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6845e14d28d7b2697cb97174428e55bdc2ea7e3f;p=civicrm-core.git

CRM-16154 - Use bower to load our Select2 fork
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 0c463d07e2..c49a26c089 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -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",
diff --git a/bower.json b/bower.json
index 9bf883f363..081516194a 100644
--- a/bower.json
+++ b/bower.json
@@ -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"