From 17cec0508776ee577b67b2542f8757accef32c79 Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Sat, 27 Oct 2012 17:35:15 +0200
Subject: [PATCH] Make new/edit issue forms use containers on the page instead of adding their own

---
 app/assets/javascripts/issues.js | 10 ++++------
 app/views/issues/edit.js.haml    |  5 ++---
 app/views/issues/index.html.haml |  2 ++
 app/views/issues/new.js.haml     |  5 ++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/issues.js b/app/assets/javascripts/issues.js
index c3cf364..db3ad7f 100644
--- a/app/assets/javascripts/issues.js
+++ b/app/assets/javascripts/issues.js
@@ -1,6 +1,5 @@
-function switchToNewIssue(form){
+function switchToNewIssue(){
   $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $(".issues_content").after(form);
     $('select#issue_assignee_id').chosen();
     $('select#issue_milestone_id').chosen();
     $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
@@ -10,9 +9,8 @@ function switchToNewIssue(form){
   });
 }
 
-function switchToEditIssue(form){
+function switchToEditIssue(){
   $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $(".issues_content").after(form);
     $('select#issue_assignee_id').chosen();
     $('select#issue_milestone_id').chosen();
     $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
@@ -33,8 +31,8 @@ function switchFromEditIssue(){
 function backToIssues(){
   $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
     $(".issues_content").show("fade", { direction: "left" }, 150, function() { 
-      $("#edit_issue_dialog").remove();
-      $("#new_issue_dialog").remove();
+      $("#edit_issue_dialog").html("");
+      $("#new_issue_dialog").html("");
       $('.add_new').show();
     });
   });
diff --git a/app/views/issues/edit.js.haml b/app/views/issues/edit.js.haml
index 76d9e02..a994572 100644
--- a/app/views/issues/edit.js.haml
+++ b/app/views/issues/edit.js.haml
@@ -1,5 +1,4 @@
 :plain
-  var edit_issue_dialog = $("<div id='edit_issue_dialog'></div>");
-  edit_issue_dialog.html("#{escape_javascript(render('form'))}");
-  switchToEditIssue(edit_issue_dialog);
+  $("#edit_issue_dialog").html("#{escape_javascript(render('form'))}");
+  switchToEditIssue();
 
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 22c34ba..d89b183 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -58,6 +58,8 @@
     %ul#issues-table.unstyled.issues_table
       = render "issues"
 
+#new_issue_dialog
+#edit_issue_dialog
 
 :javascript
   $(function(){
diff --git a/app/views/issues/new.js.haml b/app/views/issues/new.js.haml
index afa2b86..4cbcc56 100644
--- a/app/views/issues/new.js.haml
+++ b/app/views/issues/new.js.haml
@@ -1,4 +1,3 @@
 :plain
-  var new_issue_dialog = $("<div id='new_issue_dialog'></div>");
-  new_issue_dialog.html("#{escape_javascript(render('form'))}");
-  switchToNewIssue(new_issue_dialog);
+  $("#new_issue_dialog").html("#{escape_javascript(render('form'))}");
+  switchToNewIssue();
--
libgit2 0.21.2