Merge pull request #2509 from jhawthorn/datalist_autocomplete

Use datalist instead of jquery-ui/autocomplete
solidusio · Jan 23, 2018 · 0ba913b · 0ba913b
2 parents 19f82fd + 52ece09
commit 0ba913b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
@@ -4,7 +4,6 @@
 //= require jquery_ujs
 //= require jquery-ui/datepicker
 //= require jquery-ui/sortable
-//= require jquery-ui/autocomplete
 //= require jquery.sticky-kit.min
 //= require solidus_admin/select2
 //= require solidus_admin/underscore

diff --git a/backend/app/assets/stylesheets/spree/backend.css b/backend/app/assets/stylesheets/spree/backend.css
@@ -4,7 +4,6 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
 
  *= require jquery-ui/datepicker
- *= require jquery-ui/autocomplete
  *= require solidus_admin/select2
  *= require solidus_admin/flatpickr/flatpickr
  *= require prism

diff --git a/backend/app/views/spree/admin/product_properties/_product_property_fields.html.erb b/backend/app/views/spree/admin/product_properties/_product_property_fields.html.erb
@@ -6,7 +6,7 @@
     <% end %>
   </td>
   <td class='property_name'>
-    <%= f.text_field :property_name, class: 'autocomplete' %>
+    <%= f.text_field :property_name, list: 'properties' %>
   </td>
   <td class='value'>
     <%= f.text_field :value %>

diff --git a/backend/app/views/spree/admin/product_properties/index.html.erb b/backend/app/views/spree/admin/product_properties/index.html.erb
@@ -91,13 +91,6 @@
   <% end %>
 <% end %>
 
-<%= javascript_tag do -%>
-  var properties = <%= raw(@properties.to_json) %>;
-  $('#product_properties, #variant_property_values').on('keydown', 'input.autocomplete', function() {
-    already_auto_completed = $(this).is('ac_input');
-    if (!already_auto_completed) {
-      $(this).autocomplete({source: properties});
-      $(this).focus();
-    }
-  });
-<% end -%>
+<datalist id="properties">
+  <%= safe_join @properties.map { |name| tag(:option, value: name) } %>
+</datalist>