recordselect 3.6.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e70fe9dd387f2e4977683f62f5232e1b2e2bc79
-  data.tar.gz: 6fea1d8d1d538fc9a43cb616ecf3d7bf771a67b8
+  metadata.gz: 7ac1e9e5a4f739a43f8a4be495630f808787f7b5
+  data.tar.gz: c95307b6061af403a3e4a6996e47043bfbc66f3e
 SHA512:
-  metadata.gz: ce3a477f2f02b664c048ab93d990599d65c3e2f2642d6a29863d0ad2a00862297143fb9b0a22f212383eb17f6c9e7d08d5d88e9c9f952a65a343c7f8614f8c7b
-  data.tar.gz: 40d9e12ed64a3934a8a510c8b814cdf5b49e3d7f7e831a77fc74a52fa2965f3c3deb18c51f2d72c7b5bca4ab052f19ced7d68fab5efcb8686111c1db390d7b9b
+  metadata.gz: a17a0f13b7d5c1708934d1cfd5425b3eeb27e01471befcc4fcb0befc5eba403ad2d5cbb71518e3dbbef5c788804d53f6157da420da94535919314c104ee2cd63
+  data.tar.gz: 4ec482ddf60812a49c5226f8bd9263fbd8bcee453f9991d017297e04e31c99b129d839c538558692867666bc21dc45e429136377600c153b7d39fc558106bfb6

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

@@ -140,9 +140,10 @@ RecordSelect.select_item = function(item) {
   }
 }
 
-RecordSelect.observe = function(id) {
-  var form = jQuery("#" + id), min_length = 0;
-  var rs = form.closest('.record-select-container').data('recordselect');
+RecordSelect.observe = function(form) {
+  if (typeof(form) == 'string') form = '#' + form;
+  form = jQuery(form);
+  var min_length = 0, 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");
@@ -206,7 +207,7 @@ RecordSelect.Abstract = Class.extend({
     if (this.is_open()) return;
     var _this = this;
     jQuery.rails.fire(_this.obj, 'recordselect:before');
-    _this.container.html('');
+    _this.create_form();
     _this.container.show();
     var params = _this.obj.data('params'), text = _this.obj.val();
 
@@ -214,19 +215,17 @@ RecordSelect.Abstract = Class.extend({
     params = params ? [params, search_params].join("&") : search_params;
     this.current_xhr = jQuery.ajax({
       url: this.url,
-      //type: "POST",
       data: params,
-      //dataType: options.ajax_data_type,
-      success: function(data, status){
+      success: function(data, status, xhr) {
+        if (_this.current_xhr != xhr) return;
         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'));
+          RecordSelect.observe(_this.container.find('form'));
           _this.container.hide(); // needed to get right document height to position first time
           if (text.length >= _this.min_length) _this.show();
-          jQuery(document.body).mousedown(jQuery.proxy(_this, "onbodyclick"));
         }
       }
     });
@@ -292,7 +291,7 @@ RecordSelect.Abstract = Class.extend({
    * returns true/false for whether the recordselect is open
    */
   is_open: function() {
-	  return (!(jQuery.trim(this.container.html()).length == 0))
+    return jQuery.trim(this.container.html()).length != 0;
   },
 
   /**
@@ -322,11 +321,23 @@ RecordSelect.Abstract = Class.extend({
       }
     });
     jQuery(document.body).append(e);
+    jQuery(document.body).mousedown(jQuery.proxy(this, "onbodyclick"));
     if (!rs.fixed && e.offsetParent().css('position') == 'static') rs.body_static = true;
     e.get(0).onselect = jQuery.proxy(this, "onselect")
     return e;
   },
 
+  create_form: function() {
+    var div = jQuery('<div>').addClass('record-select').attr('id', this.options.id);
+    var form = jQuery('<form>').attr('action', this.url).attr('data-remote', true).attr('method', 'get');
+    form.append(jQuery('<input type="text" name="search" class="text-input">'));
+    form.append(jQuery('<input type="hidden" name="page" value="1">'));
+    form.append(jQuery('<input type="hidden" name="update" value="1">'));
+    div.append(form).append(jQuery('<ol>'));
+    this.container.html(div);
+    RecordSelect.observe(form);
+  },
+
   onkeyup: function(event) {
     if (!this.is_open()) return;
     this.container.find('.text-input').val(this.obj.val()).trigger(event);

data/lib/record_select/helpers/record_select_helper.rb

@@ -19,7 +19,7 @@ module RecordSelectHelper
     options[:html][:id] ||= "rs_#{rand(9999)}"
 
     assert_controller_responds(options[:params][:controller])
-    record_select_options = {:onselect => options[:onselect] || ''}
+    record_select_options = {id: record_select_id(controller.controller_path), onselect: options[:onselect] || ''}
     record_select_options.merge! options[:rs] if options[:rs]
 
     html = link_to(name, '#', options[:html])
@@ -49,7 +49,7 @@ module RecordSelectHelper
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
-    record_select_options = {}
+    record_select_options = {id: record_select_id(controller.controller_path)}
     record_select_options[:field_name] = options.delete(:field_name) if options[:field_name]
     if current and not current.new_record?
       record_select_options[:id] = current.id
@@ -84,7 +84,7 @@ module RecordSelectHelper
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
-    record_select_options = {:label => options.delete(:label)}
+    record_select_options = {id: record_select_id(controller.controller_path), label: options.delete(:label)}
     if current
       record_select_options[:label] ||= label_for_field(current, controller)
     end
@@ -118,7 +118,7 @@ module RecordSelectHelper
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
-    record_select_options = {}
+    record_select_options = {id: record_select_id(controller.controller_path)}
     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]
 

data/lib/record_select/version.rb

@@ -1,8 +1,8 @@
 module RecordSelect
   module Version
     MAJOR = 3
-    MINOR = 6
-    PATCH = 2
+    MINOR = 7
+    PATCH = 3
 
     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.6.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler