recordselect 3.1.5 → 3.1.6

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

@@ -161,11 +161,8 @@ RecordSelect.notify = function(item) {
   if (onselect)
   {
     try {
-      // .unescapeHTML() not implemented so far
-      var label = $.trim(item.find('label').first().html());
-      if (label.length == 0) {
-        label = item.html();
-      }
+      var label = $.trim(item.find('label').first().text());
+      if (!label) label = item.text();
       onselect(item.parent().attr('id').substr(2), label, e);
     } catch(e) {
       alert(e);
@@ -191,6 +188,9 @@ RecordSelect.Abstract = Class.extend({
     this.url = url;
     this.options = options;
     this.container;
+    if (this.options.onchange && typeof this.options.onchange != 'function') {
+      this.options.onchange = eval(this.options.onchange);
+    }
 
     if (RecordSelect.document_loaded) {
       this.onload();
@@ -438,6 +438,7 @@ RecordSelect.Single = RecordSelect.Abstract.extend({
   onselect: function(id, value) {
     this.set(id, value);
     if (this.options.onchange) this.options.onchange.call(this, id, value);
+    this.obj.trigger("recordselect:change", [id, value]);
     this.close();
   },
 
@@ -479,6 +480,7 @@ RecordSelect.Autocomplete = RecordSelect.Abstract.extend({
   onselect: function(id, value) {
     this.set(value);
     if (this.options.onchange) this.options.onchange.call(this, id, value);
+    this.obj.trigger("recordselect:change", [id, value]);
     this.close();
   },
 

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

@@ -61,6 +61,9 @@ Object.extend(RecordSelect.Abstract.prototype, {
     this.url = url;
     this.options = options;
     this.container;
+    if (this.options.onchange && typeof this.options.onchange != 'function') {
+      this.options.onchange = eval(this.options.onchange);
+    }
 
     if (RecordSelect.document_loaded) this.onload();
     else Event.observe(window, 'load', this.onload.bind(this));
@@ -304,6 +307,7 @@ RecordSelect.Single.prototype = Object.extend(new RecordSelect.Abstract(), {
   onselect: function(id, value) {
     this.set(id, value);
     if (this.options.onchange) this.options.onchange.call(this, id, value);
+    this.obj.fire('recordselect:change', {"id": id, "label": value});
     this.close();
   },
 
@@ -345,6 +349,7 @@ RecordSelect.Autocomplete.prototype = Object.extend(new RecordSelect.Abstract(),
   onselect: function(id, value) {
     this.set(value);
     if (this.options.onchange) this.options.onchange.call(this, id, value);
+    this.obj.fire('recordselect:change', {"id": id, "label": value});
     this.close();
   },
 

data/lib/record_select/helpers/record_select_helper.rb

@@ -30,25 +30,27 @@ 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.
-  # +onchange+::    A JavaScript function that will be called whenever something new is selected. It should accept the new id as the first argument, and the new label as the second argument. For example, you could set onchange to be "function(id, label) {alert(id);}", or you could create a JavaScript function somewhere else and set onchange to be "my_function" (without the parantheses!).
   def record_select_field(name, current, options = {})
     options[:controller] ||= current.class.to_s.pluralize.underscore
     options[:params] ||= {}
     options[:id] ||= name.gsub(/[\[\]]/, '_')
+    options[:class] ||= ''
+    options[:class] << ' recordselect'
 
-    id = options.delete(:id)
-    html = text_field_tag(name, nil, :autocomplete => 'off', :id => id, :class => options.delete(:class), :onfocus => "this.focused=true", :onblur => "this.focused=false")
+    ActiveSupport::Deprecation.warn 'onchange option is deprecated. Bind recordselect:change event instead.' if options[:onchange]
 
-    controller = assert_controller_responds(options[:controller])
-
-    options[:id] = options[:label] = ''
+    controller = assert_controller_responds(options.delete(:controller))
+    params = options.delete(:params)
+    record_select_options = {}
+    record_select_options[:field_name] = options.delete(:field_name) if options[:field_name]
     if current and not current.new_record?
-      options[:id] = current.id
-      options[:label] = label_for_field(current, controller)
+      record_select_options[:id] = current.id
+      record_select_options[:label] = label_for_field(current, controller)
     end
 
-    url = url_for({:action => :browse, :controller => options.delete(:controller), :escape => false}.merge(options.delete(:params)))
-    html << javascript_tag("new RecordSelect.Single(#{id.to_json}, #{url.to_json}, #{options.to_json});")
+    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, :escape => false}.merge(params))
+    html << javascript_tag("new RecordSelect.Single(#{options[:id].to_json}, #{url.to_json}, #{record_select_options.to_json});")
 
     return html
   end
@@ -63,24 +65,25 @@ 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.
-  # +onchange+::    A JavaScript function that will be called whenever something new is selected. It should accept the new id as the first argument, and the new label as the second argument. For example, you could set onchange to be "function(id, label) {alert(id);}", or you could create a JavaScript function somewhere else and set onchange to be "my_function" (without the parantheses!).
   def record_select_autocomplete(name, current, options = {})
     options[:controller] ||= current.class.to_s.pluralize.underscore
     options[:params] ||= {}
     options[:id] ||= name.gsub(/[\[\]]/, '_')
+    options[:class] ||= ''
+    options[:class] << ' recordselect'
 
-    id = options.delete(:id)
-    html = text_field_tag(name, nil, :autocomplete => 'off', :id => id, :class => options.delete(:class), :onfocus => "this.focused=true", :onblur => "this.focused=false")
-
-    controller = assert_controller_responds(options[:controller])
+    ActiveSupport::Deprecation.warn 'onchange option is deprecated. Bind recordselect:change event instead.' if options[:onchange]
 
-    options[:label] = ''
+    controller = assert_controller_responds(options.delete(:controller))
+    params = options.delete(:params)
+    record_select_options = {}
     if current and not current.new_record?
-      options[:label] = label_for_field(current, controller)
+      record_select_options[:label] = label_for_field(current, controller)
     end
 
-    url = url_for({:action => :browse, :controller => options.delete(:controller), :escape => false}.merge(options.delete(:params)))
-    html << javascript_tag("new RecordSelect.Autocomplete(#{id.to_json}, #{url.to_json}, #{options.to_json});")
+    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, :escape => false}.merge(params))
+    html << javascript_tag("new RecordSelect.Autocomplete(#{options[:id].to_json}, #{url.to_json}, #{record_select_options.to_json});")
 
     return html
   end
@@ -116,19 +119,22 @@ module RecordSelectHelper
     options[:controller] ||= current.first.class.to_s.pluralize.underscore
     options[:params] ||= {}
     options[:id] ||= name.gsub(/[\[\]]/, '_')
+    options[:class] ||= ''
+    options[:class] << ' recordselect'
+    options.delete(:name)
 
-    controller = assert_controller_responds(options[:controller])
+    controller = assert_controller_responds(options.delete(:controller))
+    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)}) }
+
+    html = text_field_tag("#{name}[]", nil, options.merge(:autocomplete => 'off', :onfocus => "this.focused=true", :onblur => "this.focused=false"))
+    html << content_tag('ul', '', :class => 'record-select-list');
 
     # js identifier so we can talk to it.
     widget = "rs_%s" % name.gsub(/[\[\]]/, '_').chomp('_')
-
-    current = current.inject([]) { |memo, record| memo.push({:id => record.id, :label => label_for_field(record, controller)}) }
-
-    url = url_for({:action => :browse, :controller => options[:controller], :escape => false}.merge(options[:params]))
-
-    html = text_field_tag("#{name}[]", nil, :autocomplete => 'off', :id => options[:id], :class => options[:class], :onfocus => "this.focused=true", :onblur => "this.focused=false")
-    html << content_tag('ul', '', :class => 'record-select-list');
-    html << javascript_tag("#{widget} = new RecordSelect.Multiple(#{options[:id].to_json}, #{url.to_json}, {current: #{current.to_json}});")
+    url = url_for({:action => :browse, :controller => controller.controller_path, :escape => false}.merge(params))
+    html << javascript_tag("#{widget} = new RecordSelect.Multiple(#{options[:id].to_json}, #{url.to_json}, #{record_select_options.to_json});")
 
     return html
   end

data/lib/record_select/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recordselect
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement