From 2d8679993c3e7ec2920fd818dacc7cb2000b9f89 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 29 Jun 2005 08:09:00 +0000 Subject: Fix JavaScriptHelper capitalization and make it compatible with Prototype #1545 [Sam Stephenson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1561 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/README | 4 ++-- .../lib/action_view/helpers/javascript_helper.rb | 28 ++++++++++++---------- actionpack/test/template/javascript_helper.rb | 6 ++--- .../test/template/upload_progress_helper_test.rb | 8 +++---- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/actionpack/README b/actionpack/README index 2c59f9df8f..df2890ffb1 100755 --- a/actionpack/README +++ b/actionpack/README @@ -168,13 +168,13 @@ A short rundown of the major features: {Learn more}[link:classes/ActionController/Base.html] -* Javascript and Ajax integration. +* JavaScript and Ajax integration. link_to_function "Greeting", "alert('Hello world!')" link_to_remote "Delete this post", :update => "posts", :url => { :action => "destroy", :id => post.id } - {Learn more}[link:classes/ActionView/Helpers/JavascriptHelper.html] + {Learn more}[link:classes/ActionView/Helpers/JavaScriptHelper.html] * Pagination for navigating lists of results. diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index a0a4076103..c73c1e08b0 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -2,19 +2,19 @@ require File.dirname(__FILE__) + '/tag_helper' module ActionView module Helpers - # Provides a set of helpers for calling Javascript functions and, most importantly, to call remote methods using what has + # Provides a set of helpers for calling JavaScript functions and, most importantly, to call remote methods using what has # been labelled Ajax[http://www.adaptivepath.com/publications/essays/archives/000385.php]. This means that you can call # actions in your controllers without reloading the page, but still update certain parts of it using injections into the # DOM. The common use case is having a form that adds a new element to a list without reloading the page. # - # To be able to use the Javascript helpers, you must either call <%= define_javascript_functions %> (which returns all - # the Javascript support functions in a def javascript_tag(content) content_tag("script", content, :type => "text/javascript") @@ -373,7 +373,7 @@ module ActionView js_options['asynchronous'] = options[:type] != :synchronous js_options['method'] = method_option_to_s(options[:method]) if options[:method] js_options['insertion'] = "Insertion.#{options[:position].to_s.camelize}" if options[:position] - js_options['script'] = options[:script] == true if options[:script] + js_options['evalScripts'] = options[:script] == true if options[:script] if options[:form] js_options['parameters'] = 'Form.serialize(this)' @@ -437,5 +437,7 @@ module ActionView ) end end + + JavascriptHelper = JavaScriptHelper unless const_defined? :JavascriptHelper end end diff --git a/actionpack/test/template/javascript_helper.rb b/actionpack/test/template/javascript_helper.rb index f70703c819..65864fc596 100644 --- a/actionpack/test/template/javascript_helper.rb +++ b/actionpack/test/template/javascript_helper.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../abstract_unit' -class JavascriptHelperTest < Test::Unit::TestCase - include ActionView::Helpers::JavascriptHelper +class JavaScriptHelperTest < Test::Unit::TestCase + include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::UrlHelper include ActionView::Helpers::TagHelper @@ -19,7 +19,7 @@ class JavascriptHelperTest < Test::Unit::TestCase def test_define_javascript_functions # check if prototype.js is included first - assert_not_nil define_javascript_functions.split("\n")[1].match(/Prototype: an object-oriented Javascript library/) + assert_not_nil define_javascript_functions.split("\n")[1].match(/Prototype JavaScript framework/) end def test_escape_javascript diff --git a/actionpack/test/template/upload_progress_helper_test.rb b/actionpack/test/template/upload_progress_helper_test.rb index 361aa4bb08..287516b765 100644 --- a/actionpack/test/template/upload_progress_helper_test.rb +++ b/actionpack/test/template/upload_progress_helper_test.rb @@ -39,7 +39,7 @@ class UploadProgressHelperTest < Test::Unit::TestCase include ActionView::Helpers::FormTagHelper include ActionView::Helpers::TagHelper include ActionView::Helpers::UrlHelper - include ActionView::Helpers::JavascriptHelper + include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::UploadProgressHelper def next_upload_id; @upload_id = last_upload_id.succ; end @@ -175,7 +175,7 @@ class UploadProgressHelperTest < Test::Unit::TestCase include ActionView::Helpers::FormTagHelper include ActionView::Helpers::TagHelper include ActionView::Helpers::UrlHelper - include ActionView::Helpers::JavascriptHelper + include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::UploadProgressHelper def next_upload_id; @upload_id = last_upload_id.succ; end @@ -258,14 +258,14 @@ class UploadProgressHelperTest < Test::Unit::TestCase def test_form_tag_with_upload_progress assert_equal( - "
", + "", form_tag_with_upload_progress ) end def test_form_tag_with_upload_progress_custom assert_equal( - "", + "", form_tag_with_upload_progress({:upload_id => 5}, {:begin => "alert('foo')", :finish => "alert('bar')", :frequency => 6, :decay => 7, :target => 'awindow'}) ) end -- cgit v1.2.3