recordselect 3.4.8 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5edf7ddc2f3ac75c1e7a4c1d5eeb181cded8a04
-  data.tar.gz: b32d4aa6c7cd22208d4b42f857b59a5d64c0bd5e
+  metadata.gz: bdc6d3a809b14a7a210f726104af134745758365
+  data.tar.gz: c6a6c0d7eb34946e0833bca299144cc1ca7b0401
 SHA512:
-  metadata.gz: 6d2d958216379cb4f9d8e7c20a2c5d7fad70843b506a6c888692ac1d1a16afae858746b4ce554509598e0c79f3e92105ca31705730733ffedf4ec6ee89c3c820
-  data.tar.gz: 3e7fc87a826167399dbcf3a6baf32813dcd74fd75b48671fa74f22c451a8e3091f1319f77585d0f760887ff18c4c45b2ed31e21d713ac3fc86703dc01b1c1f4b
+  metadata.gz: b827899803ea63753c798f32c7d0cc0b6ef404cb195ed40e389e8a81adf08288df955875820276e8970e3546ac88160692f10b86a041558a8a63389433dd1e9f
+  data.tar.gz: 8a203cce44027975b163aa03af8e53bfeb4ca6c4e2514fa606b20ea971ac8dd3a90c84bca8ac800f443cd249b7cac664db1b89575353fd8125775d1b59e95a7c

data/app/assets/javascripts/jquery/record_select.js

@@ -110,6 +110,18 @@ jQuery(document).ready(function() {
     }
     return true;
   });
+  jQuery(document).on('ajax:beforeSend', '.record-select-container', function(event, xhr) {
+    var rs = jQuery(this).data('recordselect'), cur = rs.current_xhr;
+    rs.current_xhr = xhr;
+    if (cur) cur.abort();
+  });
+  jQuery(document).on('ajax:complete', '.record-select-container', function(event, xhr, status) {
+    var rs = jQuery(this).data('recordselect');
+    if (status != 'abort' || rs.current_xhr == xhr) {
+      if (rs.is_open()) rs.show();
+      rs.current_xhr = null;
+    }
+  });
 });
 
 var RecordSelect = new Object();
@@ -129,10 +141,17 @@ RecordSelect.select_item = function(item) {
 }
 
 RecordSelect.observe = function(id) {
-  var form = jQuery("#" + id);
+  var form = jQuery("#" + id), min_length = 0;
+  var rs = form.closest('.record-select-container').data('recordselect');
+  if (rs) min_length = rs.min_length;
   form.find('input.text-input').delayedObserver(function() {
     if (form.closest('body').length) form.trigger("submit");
-  }, 0.35);
+  }, 0.35, {
+    condition: function() {
+      var item = jQuery(this);
+      return item.data('oldval') == item.val() || item.val().length < min_length;
+    }
+  });
 }
 
 RecordSelect.render_page = function(record_select_id, page) {
@@ -151,6 +170,7 @@ RecordSelect.Abstract = Class.extend({
     this.url = url;
     this.options = options;
     this.container;
+    this.min_length = options.min_length || 0;
     if (this.options.onchange && typeof this.options.onchange != 'function') {
       this.options.onchange = eval(this.options.onchange);
     }
@@ -185,22 +205,24 @@ RecordSelect.Abstract = Class.extend({
     jQuery.rails.fire(_this.obj, 'recordselect:before');
     _this.container.html('');
     _this.container.show();
-    var params = _this.obj.data('params');
-    var search_params = jQuery.param({search: _this.obj.val()});
+    var params = _this.obj.data('params'), text = _this.obj.val();
+
+    var search_params = jQuery.param({search: text});
     params = params ? [params, search_params].join("&") : search_params;
-    jQuery.ajax({
+    this.current_xhr = jQuery.ajax({
       url: this.url,
       //type: "POST",
       data: params,
       //dataType: options.ajax_data_type,
-      success: function(data){
+      success: function(data, status){
+        if (status != 'abort') _this.current_xhr = null;
         _this.container.html(data);
         if (!_this.container.is(':visible')) _this.close();
         else {
           _this.container.find('.text-input').val(_this.obj.val());
           RecordSelect.observe(_this.container.find('form').attr('id'));
           _this.container.hide(); // needed to get right document height to position first time
-          _this.show();
+          if (text.length >= this.min_length) _this.show();
           jQuery(document.body).mousedown(jQuery.proxy(_this, "onbodyclick"));
         }
       }

data/lib/record_select/helpers/record_select_helper.rb

@@ -4,6 +4,8 @@ module RecordSelectHelper
   # *Options*
   # +onselect+::  JavaScript code to handle selections client-side. This code has access to two variables: id, label. If the code returns false, the dialog will *not* close automatically.
   # +params+::    Extra URL parameters. If any parameter is a column name, the parameter will be used as a search term to filter the result set.
+  # +html+::      Options for A tag
+  # +rs+::        Options for RecordSelect constructor
   def link_to_record_select(name, controller, options = {})
     options[:params] ||= {}
     options[:params].merge!(:controller => controller, :action => :browse)
@@ -12,9 +14,11 @@ module RecordSelectHelper
     options[:html][:id] ||= "rs_#{rand(9999)}"
 
     assert_controller_responds(options[:params][:controller])
+    record_select_options = {:onselect => options[:onselect] || ''}
+    record_select_options.merge! options[:rs] if options[:rs]
 
     html = link_to(name, '#', options[:html])
-    html << javascript_tag("new RecordSelect.Dialog(#{options[:html][:id].to_json}, #{url_for(options[:params]).to_json}, {onselect: #{options[:onselect] || ''}})")
+    html << javascript_tag("new RecordSelect.Dialog(#{options[:html][:id].to_json}, #{url_for(options[:params]).to_json}, #{record_select_options.to_json});")
 
     return html
   end
@@ -30,6 +34,7 @@ module RecordSelectHelper
   # +params+::      A hash of extra URL parameters
   # +id+::          The id to use for the input. Defaults based on the input's name.
   # +field_name+::  The name to use for the text input. Defaults to '', so field is not submitted.
+  # +rs+::          Options for RecordSelect constructor
   def record_select_field(name, current, options = {})
     options[:controller] ||= current.class.to_s.pluralize.underscore
     options[:params] ||= {}
@@ -45,6 +50,7 @@ module RecordSelectHelper
       record_select_options[:id] = current.id
       record_select_options[:label] = label_for_field(current, controller)
     end
+    record_select_options.merge! options[:rs] if options[:rs]
 
     html = text_field_tag(name, nil, options.merge(:autocomplete => 'off', :onfocus => "this.focused=true", :onblur => "this.focused=false"))
     url = url_for({:action => :browse, :controller => controller.controller_path}.merge(params))
@@ -63,6 +69,7 @@ module RecordSelectHelper
   # +controller+::  The controller configured to provide the result set. Optional if you have standard resource controllers (e.g. UsersController for the User model), in which case the controller will be inferred from the class of +current+ (the second argument)
   # +params+::      A hash of extra URL parameters
   # +id+::          The id to use for the input. Defaults based on the input's name.
+  # +rs+::          Options for RecordSelect constructor
   def record_select_autocomplete(name, current, options = {})
     options[:controller] ||= current.class.to_s.pluralize.underscore
     options[:params] ||= {}
@@ -76,6 +83,7 @@ module RecordSelectHelper
     if current
       record_select_options[:label] ||= label_for_field(current, controller)
     end
+    record_select_options.merge! options[:rs] if options[:rs]
 
     html = text_field_tag(name, nil, options.merge(:autocomplete => 'off', :onfocus => "this.focused=true", :onblur => "this.focused=false"))
     url = url_for({:action => :browse, :controller => controller.controller_path}.merge(params))
@@ -94,6 +102,7 @@ module RecordSelectHelper
   # +controller+::  The controller configured to provide the result set.
   # +params+::      A hash of extra URL parameters
   # +id+::          The id to use for the input. Defaults based on the input's name.
+  # +rs+::          Options for RecordSelect constructor
   def record_multi_select_field(name, current, options = {})
     options[:controller] ||= current.first.class.to_s.pluralize.underscore
     options[:params] ||= {}
@@ -106,6 +115,7 @@ module RecordSelectHelper
     params = options.delete(:params)
     record_select_options = {}
     record_select_options[:current] = current.inject([]) { |memo, record| memo.push({:id => record.id, :label => label_for_field(record, controller)}) }
+    record_select_options.merge! options[:rs] if options[:rs]
 
     html = text_field_tag("#{name}[]", nil, options.merge(:autocomplete => 'off', :onfocus => "this.focused=true", :onblur => "this.focused=false"))
     html << hidden_field_tag("#{name}[]", '', :id => nil)

data/lib/record_select/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: RecordSelect widget as a replacement for massive drop down lists