diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5469f779b3..f14d6f3e54 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix observe_field to fall back to event-based observation if frequency <= 0 #1916 [michael@schubert.cx] + * Allow use of the :with option for submit_to_remote #1936 [jon@instance-design.co.uk] * AbstractRequest#domain returns nil when host is an ip address #2012 [kevin.clark@gmail.com] diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 2bd741bd79..e6985c5eb7 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -305,9 +305,10 @@ module ActionView # # Additional options are: # <tt>:frequency</tt>:: The frequency (in seconds) at which changes to - # this field will be detected. Set this to a value - # greater than zero to use time based observation - # instead of event based observation. + # this field will be detected. Not setting this + # option at all or to a value equal to or less than + # zero will use event based observation instead of + # time based observation. # <tt>:update</tt>:: Specifies the DOM ID of the element whose # innerHTML should be updated with the # XMLHttpRequest response text. @@ -319,7 +320,7 @@ module ActionView # Additionally, you may specify any of the options documented in # +link_to_remote. def observe_field(field_id, options = {}) - if options[:frequency] + if options[:frequency] and options[:frequency] > 0 build_observer('Form.Element.Observer', field_id, options) else build_observer('Form.Element.EventObserver', field_id, options) |