Switch to using vendored select2 assets

Removes the select2-rails gem in favour of using the vendored version.
solidusio · Mar 14, 2017 · a32cae2 · a32cae2
1 parent 30b1c51
commit a32cae2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 49 deletions.
diff --git a/backend/app/assets/config/solidus_backend_manifest.js b/backend/app/assets/config/solidus_backend_manifest.js
@@ -3,48 +3,4 @@
 //= link spree/backend/all.js
 //= link spree/backend/all.css
 
-//= link select2_locale_ar.js
-//= link select2_locale_az.js
-//= link select2_locale_bg.js
-//= link select2_locale_ca.js
-//= link select2_locale_cs.js
-//= link select2_locale_da.js
-//= link select2_locale_de.js
-//= link select2_locale_el.js
-//= link select2_locale_es.js
-//= link select2_locale_et.js
-//= link select2_locale_eu.js
-//= link select2_locale_fa.js
-//= link select2_locale_fi.js
-//= link select2_locale_fr.js
-//= link select2_locale_gl.js
-//= link select2_locale_he.js
-//= link select2_locale_hr.js
-//= link select2_locale_hu.js
-//= link select2_locale_id.js
-//= link select2_locale_is.js
-//= link select2_locale_it.js
-//= link select2_locale_ja.js
-//= link select2_locale_ka.js
-//= link select2_locale_ko.js
-//= link select2_locale_lt.js
-//= link select2_locale_lv.js
-//= link select2_locale_mk.js
-//= link select2_locale_ms.js
-//= link select2_locale_nl.js
-//= link select2_locale_no.js
-//= link select2_locale_pl.js
-//= link select2_locale_pt-BR.js
-//= link select2_locale_pt-PT.js
-//= link select2_locale_ro.js
-//= link select2_locale_rs.js
-//= link select2_locale_ru.js
-//= link select2_locale_sk.js
-//= link select2_locale_sv.js
-//= link select2_locale_th.js
-//= link select2_locale_tr.js
-//= link select2_locale_ug-CN.js
-//= link select2_locale_uk.js
-//= link select2_locale_vi.js
-//= link select2_locale_zh-CN.js
-//= link select2_locale_zh-TW.js
+//= link solidus_admin/select2_locales
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
@@ -6,6 +6,7 @@
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
 //= require jquery.sticky-kit.min
+//= require solidus_admin/select2
 //= require solidus_admin/underscore
 //= require solidus_admin/backbone
 //= require solidus_admin/backbone-nested-models
@@ -16,7 +17,6 @@
 //= require spree/backend/namespaces
 //= require spree/backend/translation
 //= require spree/backend/backbone-overrides
-//= require spree/backend/spree-select2
 //= require spree/backend/format_money
 //
 //= require spree/backend/templates

diff --git a/backend/app/assets/javascripts/spree/backend/spree-select2.js b/backend/app/assets/javascripts/spree/backend/spree-select2.js
@@ -1,4 +1,4 @@
-//= require select2
+//= require solidus_admin/select2
 jQuery(function($) {
   // Make select beautiful
   $('select.select2').select2({

diff --git a/backend/app/assets/stylesheets/spree/backend.css b/backend/app/assets/stylesheets/spree/backend.css
@@ -5,7 +5,7 @@
 
  *= require jquery-ui/datepicker
  *= require jquery-ui/autocomplete
- *= require select2
+ *= require solidus_admin/select2
  *= require prism
 
  *= require spree/backend/spree_admin

diff --git a/backend/app/views/spree/admin/shared/_js_locale_data.html.erb b/backend/app/views/spree/admin/shared/_js_locale_data.html.erb
@@ -43,5 +43,5 @@
 </script>
 
 <% if I18n.locale != :en %>
-  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
+  <%= javascript_include_tag "solidus_admin/select2_locales/select2_locale_#{I18n.locale}" %>
 <% end %>