diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-19 19:10:18 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-19 19:10:18 +0000 |
commit | 3eaa998c28eb5f5dcbe0af6181ac28521c92f75d (patch) | |
tree | 0b4087ddbefa9765fc853039fb4ad8507ffc19f8 /app/controllers/journals_controller.rb | |
parent | e8469e2c5b41e59a1a204ac730e2c3ab9261b8ff (diff) | |
download | redmine-3eaa998c28eb5f5dcbe0af6181ac28521c92f75d.tar.gz redmine-3eaa998c28eb5f5dcbe0af6181ac28521c92f75d.zip |
Removes RJS from JournalsController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10054 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/journals_controller.rb')
-rw-r--r-- | app/controllers/journals_controller.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index c063e8c82..287d94440 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -67,16 +67,8 @@ class JournalsController < ApplicationController end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]') - content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " - content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" - - render(:update) { |page| - page.<< "$('notes').value = \"#{escape_javascript content}\";" - page.show 'update' - page << "Form.Element.focus('notes');" - page << "Element.scrollTo('update');" - page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;" - } + @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" end def edit |