small refactorings of generated javascripts

app/views/projects/create.js.erb

@@ -2,7 +2,7 @@
   TracksPages.show_errors(html_for_error_messages());
 
   function html_for_error_messages() {
-    return "<%= escape_javascript(get_list_of_error_messages_for(@project)) %>";
+    return "<%= js_error_messages_for(@project) %>";
   }
 <% else -%>
   <% if @go_to_project -%>
@@ -14,7 +14,7 @@
   update_active_projects_container();
   add_project();
   clear_form();
-  TracksPages.page_notify('notice', "Created new project '<%= @project.name%>'", 5);
+  TracksPages.page_inform("Created new project '<%= @project.name%>'");
   <% end -%>
 
 /* TODO: make this generic for all pages with lists */
@@ -40,7 +40,7 @@ function update_active_projects_container() {
 }
 
 function html_for_project_listing() {
-  return "<%= @saved ? escape_javascript(render(:partial => 'project_listing', :object => @project)) : "" %>";
+  return "<%= @saved ? js_render('project_listing', {}, @project) : "" %>";
 }
 
 <% end -%>

app/views/projects/destroy.js.erb

@@ -1,12 +1,9 @@
 remove_deleted_project();
 ProjectListPage.update_all_states_count(<%=@active_projects_count%>, <%=@hidden_projects_count%>, <%=@completed_projects_count%>)
-TracksPages.page_notify('notice', "Deleted project '<%= @project.name%>'", 5);
+TracksPages.page_inform("<%= t('projects.project_destroyed_status', name: @project.name) %>");
 TracksPages.set_page_badge(<%=@down_count%>);
 
 /* TODO: refactor and move function to application.js */
 function remove_deleted_project() {
-  $('div#<%=dom_id(@project, "container")%>').slideUp(1000,
-    function() {
-      $('div#<%=dom_id(@project, "container")%>').remove();
-    });
+  TracksPages.slide_up_and_remove('div#<%=dom_id(@project, "container")%>');
 }

app/views/projects/edit.js.erb

@@ -6,8 +6,14 @@
   object_name = unique_object_name_for("edit_project_#{@project.id}")
 -%>  
 var <%=object_name%> = {
-  html_for_edit_form: function() {
-    return "<%= escape_javascript(render(:partial => 'project_form', :object => @project)) %>";
+  animate: function() {
+    <%=object_name%>.replace_project_with_edit_form();
+  },
+  replace_project_with_edit_form: function() {
+    $('<%= selector_project %>').fadeOut(250, function() {
+      <%=object_name%>.show_edit_form();
+      <%=object_name%>.set_focus();
+    });
   },
   show_edit_form: function() {
     $('<%= selector_edit %>').html(<%=object_name%>.html_for_edit_form());
@@ -17,14 +23,8 @@ var <%=object_name%> = {
   set_focus: function() {
     $('input.project-name').focus();
   },
-  replace_project_with_edit_form: function() {
-    $('<%= selector_project %>').fadeOut(250, function() {
-      <%=object_name%>.show_edit_form();
-      <%=object_name%>.set_focus();
-    });
-  },
-  animate: function() {
-    <%=object_name%>.replace_project_with_edit_form();
+  html_for_edit_form: function() {
+    return "<%= js_render('project_form', {}, @project) %>";
   }
 }
 

app/views/projects/update.js.erb

@@ -7,13 +7,13 @@ var <%=object_name%> = {
       TracksPages.show_edit_errors(<%=object_name%>.html_for_error_messages());
     },
     html_for_error_messages: function() {
-      return "<%= escape_javascript(get_list_of_error_messages_for(@project)) %>";
+      return "<%= js_error_messages_for(@project) %>";
     }
   <%- 
     else
   -%>
     animate: function() {
-      TracksPages.page_notify('notice', '<%=t('projects.project_saved_status')%>', 5);
+      TracksPages.page_inform('<%=t('projects.project_saved_status')%>');
       <% if source_view_is_one_of(:project_list, :review) -%>
         <%=object_name%>.update_project_list_page();
       <% else # assume source_view :project -%>
@@ -84,13 +84,13 @@ var <%=object_name%> = {
     # render it into the function.
     -%>
     html_for_project_listing: function() {
-      return "<%= source_view_is_one_of(:project_list, :review) ? escape_javascript(render(:partial => 'project_listing', :object => @project, :locals=>{:suppress_drag_handle => source_view_is(:review)} )) : "" %>";
+      return "<%= source_view_is_one_of(:project_list, :review) ? js_render('project_listing', {:suppress_drag_handle => source_view_is(:review)}, @project) : "" %>";
     },
     html_for_sidebar: function() {
       return "<%= source_view_is(:project) ? escape_javascript(render(:file => 'sidebar/sidebar')) : "" %>";
     },
     html_for_project_settings: function() {
-      return "<%= source_view_is(:project) ? escape_javascript(render(:partial => 'project_settings', :object => @project )) : "" %>";
+      return "<%= source_view_is(:project) ? js_render('project_settings', {}, @project) : "" %>";
     }
   <% end # if @saved -%>
 }

app/views/projects/update_project_name.js.erb

@@ -1,4 +1,4 @@
 <% if @saved -%>
-  TracksPages.page_notify('notice', '<%=t('projects.status_project_name_changed')%>', 5);
+  TracksPages.page_inform('<%=t('projects.status_project_name_changed')%>');
   TracksForm.set_project_name("<%= escape_javascript(@project.name)%>");
 <% end %>