annotate app/views/journals/edit.js.erb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 433d4f72a19b
children
rev   line source
Chris@1115 1 $("#journal-<%= @journal.id %>-notes").hide();
Chris@1115 2
Chris@1115 3 if ($("form#journal-<%= @journal.id %>-form").length > 0) {
Chris@1115 4 // journal edit form already loaded
Chris@1115 5 $("#journal-<%= @journal.id %>-form").show();
Chris@1115 6 } else {
Chris@1115 7 $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
Chris@1115 8 }