From 6ec07e0737c3099056fc11fe43f4f19dde3770a6 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 26 Aug 2008 16:17:58 -0500
Subject: Store application and other context specific helper modules in
 ActionView::Base#helpers

---
 .../lib/action_view/helpers/prototype_helper.rb    | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index ff83494e94..2ce818cd71 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -588,26 +588,8 @@ module ActionView
 
         private
           def include_helpers_from_context
-            unless generator_methods_module = @context.instance_variable_get(:@__javascript_generator_methods__)
-              modules = @context.extended_by - ([ActionView::Helpers] + ActionView::Helpers.included_modules)
-
-              generator_methods_module = Module.new do
-                modules.each do |mod|
-                  begin
-                    include mod
-                  rescue Exception => e
-                    # HACK: Probably not a good idea to suppress these warnings
-                    # AFAIK exceptions are only raised in while testing with mocha
-                    # because the module does not like to be included into other
-                    # non TestUnit classes
-                  end
-                end
-                include GeneratorMethods
-              end
-              @context.instance_variable_set(:@__javascript_generator_methods__, generator_methods_module)
-            end
-
-            extend generator_methods_module
+            extend @context.helpers if @context.respond_to?(:helpers)
+            extend GeneratorMethods
           end
 
         # JavaScriptGenerator generates blocks of JavaScript code that allow you
-- 
cgit v1.2.3


From 6450d6ca76603bc5d1b1a6cdcb77e33e35f53d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Sat, 30 Aug 2008 02:08:16 +0300
Subject: Added button_to_remote helper

Ticket originally from http://dev.rubyonrails.org/ticket/3641

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 actionpack/lib/action_view/helpers/prototype_helper.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 2ce818cd71..94c5abe2a1 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -255,6 +255,14 @@ module ActionView
         link_to_function(name, remote_function(options), html_options || options.delete(:html))
       end
 
+      # Creates a button with an onclick event which calls a remote action
+      # via XMLHttpRequest
+      # The options for specifying the target with :url
+      # and defining callbacks is the same as link_to_remote.
+      def button_to_remote(name, options = {}, html_options = {})
+        button_to_function(name, remote_function(options), html_options)
+      end
+
       # Periodically calls the specified url (<tt>options[:url]</tt>) every
       # <tt>options[:frequency]</tt> seconds (default is 10). Usually used to
       # update a specified div (<tt>options[:update]</tt>) with the results
-- 
cgit v1.2.3


From 367a55e1b8deb87e7388cb97b2ac8c28a0796c89 Mon Sep 17 00:00:00 2001
From: miloops <miloops@gmail.com>
Date: Sat, 30 Aug 2008 19:49:32 -0300
Subject: Allow prototype functions to receive position parameter as a symbol.

[#887 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 actionpack/lib/action_view/helpers/prototype_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 94c5abe2a1..2f08583b16 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1060,7 +1060,7 @@ module ActionView
 
         js_options['asynchronous'] = options[:type] != :synchronous
         js_options['method']       = method_option_to_s(options[:method]) if options[:method]
-        js_options['insertion']    = options[:position].to_s.downcase if options[:position]
+        js_options['insertion']    = "'#{options[:position].to_s.downcase}'" if options[:position]
         js_options['evalScripts']  = options[:script].nil? || options[:script]
 
         if options[:form]
-- 
cgit v1.2.3


From 6ef35461dc7148ce37ed602d65a24f6c883fd044 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Wed, 3 Sep 2008 17:58:47 +0100
Subject: Merge docrails

---
 actionpack/lib/action_view/helpers/prototype_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 2f08583b16..ff41a6d417 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -614,7 +614,7 @@ module ActionView
         # Example:
         #
         #   # Generates:
-        #   #     new Element.insert("list", { bottom: <li>Some item</li>" });
+        #   #     new Element.insert("list", { bottom: "<li>Some item</li>" });
         #   #     new Effect.Highlight("list");
         #   #     ["status-indicator", "cancel-link"].each(Element.hide);
         #   update_page do |page|
-- 
cgit v1.2.3