recordselect 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0ef7c94da94faaf00ae9051a1df4df8f2eaffb81b688227077980a08b3779e9
-  data.tar.gz: f41bab439890701d105855510b961364e13cb6b6e1682273aaa8db84c73d408a
+  metadata.gz: 0e5ff734695b0b0234dd6ee6307440e1de3a3a72f87798026b18b0e0739e26b1
+  data.tar.gz: a12a0c135cc28dcc72121be2361233b347c0915c8590f31aab566d97b28467fa
 SHA512:
-  metadata.gz: d8cd9703b6f7a2d4e7eb36299a65d002ee87b273afeda9490c673a049d0e041ac63f73bdbfbc8235556ad33e380ae6b6be5f7769e19ec7cb798c42c7d7636b3b
-  data.tar.gz: 4f444e548ac1d7052c9e0f1e320bb92f3c207aba91ec92e76399faa3211dc156a449a9883b963c3c4745a191891c1e5b629b4fe9b02455d81e99e8bbdf99e3da
+  metadata.gz: 2149f1cfa9f94456836fd71d3c5a3f6d4e636c01d8fb3b0c9ea2138b785f902513ec9824c9e9f489099dde7cd544356aa55c93d710a8ba510a8490fe7135a6d2
+  data.tar.gz: ea348566bafb9430145039802fcdd8c7bb7053f025e0bde06520a79a1974b6d7dbb7b72c0af3005696149e8ff56a2be6cd7bee236b8ffd96e884d015b2c7eb9f

data/app/assets/javascripts/record_select.js

@@ -142,7 +142,7 @@
           rs.current_xhr = null;
         }
       });
-      jQuery(document).on('click', 'input.recordselect ~ .clear-input-button', function() {
+      jQuery(document).on('click', 'input.recordselect ~ .clear-input-button', function(event) {
         var $clear_button = jQuery(event.target), $input = $clear_button.prevAll('input');
         if (!$input.length) return;
         $input.val('').removeClass('selected');
@@ -163,8 +163,9 @@
     RecordSelect.document_loaded = false;
 
     RecordSelect.from_attributes = function(item) {
+      if (item.prop('disabled')) return;
       var rs_class = RecordSelect[item.data('rs-type')];
-      new rs_class(item.data('rs-id'), item.data('rs-url'), item.data('rs-options'));
+      new rs_class(item.data('rs-id') || item, item.data('rs-url'), item.data('rs-options'));
     }
 
     RecordSelect.select_item = function(item) {
@@ -227,7 +228,8 @@
         if (RecordSelect.document_loaded) {
           this.onload();
         } else {
-          var _this = this; jQuery(document).ready(function() { _this.onload(); })
+          var _this = this;
+          jQuery(document).ready(function() { _this.onload(); });
         }
       },
 
@@ -336,7 +338,7 @@
        * returns true/false for whether the recordselect is open
        */
       is_open: function() {
-        return jQuery.trim(this.container.html()).length != 0;
+        return this.container.children().length != 0;
       },
 
       /**

data/lib/record_select/helpers/record_select_helper.rb

@@ -21,15 +21,16 @@ module RecordSelectHelper
     options[:onselect] = "(function(id, label) {#{options[:onselect]}})" if options[:onselect]
     options[:html] ||= {}
     options[:html][:id] ||= "rs_#{rand(9999)}"
+    js = options.include?(:js) ? options[:js] : request.xhr?
 
     controller = assert_controller_responds(options[:params][:controller])
     record_select_options = {id: record_select_id(controller.controller_path), onselect: options[:onselect] || ''}
     record_select_options.merge! options[:rs] if options[:rs]
 
     rs_data = {type: 'Dialog', id: options[:html][:id], url: url_for(options[:params]), options: record_select_options}
-    options[:html][:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:html][:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = link_to(name, '#', options[:html])
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -53,6 +54,7 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
     options[:clear_button] = true unless options.include? :clear_button
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -70,10 +72,10 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Single', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag(name, nil, options)
     html << button_tag('x', type: :button, class: clear_button_class, aria_label: 'Clear input', title: 'Clear input') if clear_button
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -95,6 +97,7 @@ module RecordSelectHelper
     options[:id] ||= name.gsub(/[\[\]]/, '_')
     options[:class] ||= ''
     options[:class] << ' recordselect'
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -107,9 +110,9 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Autocomplete', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag(name, nil, options)
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -132,6 +135,7 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
     options.delete(:name)
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -142,11 +146,11 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Multiple', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag("#{name}[]", nil, options)
     html << hidden_field_tag("#{name}[]", '', id: nil)
     html << content_tag(:ul, '', class: 'record-select-list')
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 0
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: RecordSelect widget as a replacement for massive drop down lists