diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-11 05:17:22 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-11 05:17:22 +0000 |
| commit | 16669774903dd7bfaaf1bf8f0c72e49ebaeffeeb (patch) | |
| tree | 1e2b6e66d19e261efeceeb6937c605785527ee57 /actionpack/lib/action_view/helpers/javascript_helper.rb | |
| parent | 1911f8eee928915f1020753a4a3ba34c81131a66 (diff) | |
| download | rails-16669774903dd7bfaaf1bf8f0c72e49ebaeffeeb.tar.gz rails-16669774903dd7bfaaf1bf8f0c72e49ebaeffeeb.tar.bz2 rails-16669774903dd7bfaaf1bf8f0c72e49ebaeffeeb.zip | |
Script.aculo.us: latest rev, new autocompleter features, memory leaks fixed #1695 [Thomas Fuchs]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1810 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascript_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 7dd74f20ff..7034b95000 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -358,8 +358,13 @@ module ActionView function << "'#{field_id}', " function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', " function << "'#{url_for(options[:url])}'" - + js_options = {} + if options[:tokens] and options[:tokens].kind_of?(Array) + js_options[:tokens] = "['#{options[:tokens].join('\',\'')}']" + elsif options[:tokens] + js_options[:tokens] = "'#{options[:tokens]}'" if options[:tokens] + end js_options[:callback] = "function(element, value) { return #{options[:with]} }" if options[:with] js_options[:indicator] = "'#{options[:indicator]}'" if options[:indicator] function << (', ' + options_for_javascript(js_options) + ')') |