diff options
| author | Thiago Pradi <tchandy@gmail.com> | 2010-09-01 19:46:43 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-02 11:51:07 +0200 |
| commit | df7f441c6e885afb6fecebe17387defe05220fa1 (patch) | |
| tree | bd043671b6b2ed222b207c783bde6878be4c13d4 | |
| parent | 7698596adb0f94a052055e4fb931dffe3fb5361d (diff) | |
| download | rails-df7f441c6e885afb6fecebe17387defe05220fa1.tar.gz rails-df7f441c6e885afb6fecebe17387defe05220fa1.tar.bz2 rails-df7f441c6e885afb6fecebe17387defe05220fa1.zip | |
Removing RJS hack
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ff25c36fcd..b0a57f47d3 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -188,11 +188,6 @@ module ActionView #:nodoc: delegate :logger, :to => :controller, :allow_nil => true - # TODO: HACK FOR RJS - def view_context - self - end - def self.xss_safe? #:nodoc: true end diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 99f9363a9a..b600666536 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -579,7 +579,7 @@ module ActionView # page.hide 'spinner' # end def update_page(&block) - JavaScriptGenerator.new(view_context, &block).to_s.html_safe + JavaScriptGenerator.new(self, &block).to_s.html_safe end # Works like update_page but wraps the generated JavaScript in a <script> |