From 3589871de82c12123f62c80b4924d2696412065c Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Mon, 13 Mar 2006 02:11:59 +0000
Subject: Added simple alert() notifications for RJS exceptions when
 config.action_view.debug_rjs = true.  Set debug_rjs = true for the default
 development environment.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3856 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../lib/action_view/helpers/prototype_helper.rb     | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 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 1f6aa274db..7781612180 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -370,12 +370,12 @@ module ActionView
         end
       
         private
-        def include_helpers_from_context
-          @context.extended_by.each do |mod|
-            extend mod unless mod.name =~ /^ActionView::Helpers/
+          def include_helpers_from_context
+            @context.extended_by.each do |mod|
+              extend mod unless mod.name =~ /^ActionView::Helpers/
+            end
+            extend GeneratorMethods
           end
-          extend GeneratorMethods
-        end
       
         # JavaScriptGenerator generates blocks of JavaScript code that allow you 
         # to change the content and presentation of multiple DOM elements.  Use 
@@ -425,7 +425,12 @@ module ActionView
         # <script> tag.
         module GeneratorMethods
           def to_s #:nodoc:
-            @lines * $/
+            returning javascript = @lines * $/ do
+              if ActionView::Base.debug_rjs
+                javascript.replace "try {\n#{javascript}\n} catch (e) "
+                javascript << "{ alert('RJS error:\\n\\n' + e.toString()); throw e }"
+              end
+            end
           end
           
           # Returns a element reference by finding it through +id+ in the DOM. This element can then be
@@ -748,7 +753,7 @@ module ActionView
     class JavaScriptElementProxy < JavaScriptProxy #:nodoc:
       def initialize(generator, id)
         @id = id
-        super(generator, "$('#{id}')")
+        super(generator, "$(#{id.to_json})")
       end
       
       def replace_html(*options_for_render)
@@ -874,7 +879,7 @@ module ActionView
     
     class JavaScriptElementCollectionProxy < JavaScriptCollectionProxy #:nodoc:\
       def initialize(generator, pattern)
-        super(generator, "$$('#{pattern}')")
+        super(generator, "$$(#{pattern.to_json})")
       end
     end
   end
-- 
cgit v1.2.3