5 files changed, 16 insertions, 13 deletions
diff --git a/app/views/journals/edit.js.erb b/app/views/journals/edit.js.erb
new file mode 100644
index 000000000..18d85a4ce
--- /dev/null
+++ b/app/views/journals/edit.js.erb
@@ -0,0 +1,2 @@
+Element.hide("journal-<%= @journal.id %>-notes");
+Element.insert("journal-<%= @journal.id %>-notes", {'after': '<%= escape_javascript(render :partial => 'notes_form') %>'});
diff --git a/app/views/journals/edit.rjs b/app/views/journals/edit.rjs
deleted file mode 100644
index 798cb0f04..000000000
--- a/app/views/journals/edit.rjs
+++ /dev/null
@@ -1,3 +0,0 @@
-page.hide "journal-#{@journal.id}-notes"
-page.insert_html :after, "journal-#{@journal.id}-notes",
-                 :partial => 'notes_form'
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
new file mode 100644
index 000000000..e2e6590ae
--- /dev/null
+++ b/app/views/journals/new.js.erb
@@ -0,0 +1,5 @@
+$('notes').value = "<%= raw escape_javascript(@content) %>";
+Element.show('update');
+Form.Element.focus('notes');
+Element.scrollTo('update');
+$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;
diff --git a/app/views/journals/update.js.erb b/app/views/journals/update.js.erb
new file mode 100644
index 000000000..9b16273ab
--- /dev/null
+++ b/app/views/journals/update.js.erb
@@ -0,0 +1,9 @@
+<% if @journal.frozen? %>
+  Element.remove("change-<%= @journal.id %>");
+<% else %>
+  Element.replace("journal-<%= @journal.id %>-notes", '<%= escape_javascript(render_notes(@journal.issue, @journal, :reply_links => authorize_for('issues', 'edit'))) %>');
+  Element.show("journal-<%= @journal.id %>-notes");
+  Element.remove("journal-<%= @journal.id %>-form");
+<% end %>
+
+<%= call_hook(:view_journals_update_js_bottom, { :journal => @journal }) %>
diff --git a/app/views/journals/update.rjs b/app/views/journals/update.rjs
deleted file mode 100644
index a83d58126..000000000
--- a/app/views/journals/update.rjs
+++ /dev/null
@@ -1,10 +0,0 @@
-if @journal.frozen?
-  # journal was destroyed
-  page.remove "change-#{@journal.id}"
-else
-  page.replace "journal-#{@journal.id}-notes", render_notes(@journal.issue, @journal, :reply_links => authorize_for('issues', 'edit'))
-  page.show "journal-#{@journal.id}-notes"
-  page.remove "journal-#{@journal.id}-form"
-end
-
-call_hook(:view_journals_update_rjs_bottom, { :page => page, :journal => @journal })