Download as
Browse Code »

Commit 17cec0508776ee577b67b2542f8757accef32c79

Authored by Riyad Preukschas
1 parent 2f5e44a0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Make new/edit issue forms use containers on the page instead of adding their own 

Fixes #1830
Showing 4 changed files with 10 additions and 12 deletions   Show diff stats
app/assets/javascripts/issues.js
  Diff comments   View file @17cec05
1   -function switchToNewIssue(form){
  1 +function switchToNewIssue(){
2 2 $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
3   - $(".issues_content").after(form);
4 3 $('select#issue_assignee_id').chosen();
5 4 $('select#issue_milestone_id').chosen();
6 5 $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
... ... @@ -10,9 +9,8 @@ function switchToNewIssue(form){
10 9 });
11 10 }
12 11  
13   -function switchToEditIssue(form){
  12 +function switchToEditIssue(){
14 13 $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
15   - $(".issues_content").after(form);
16 14 $('select#issue_assignee_id').chosen();
17 15 $('select#issue_milestone_id').chosen();
18 16 $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
... ... @@ -33,8 +31,8 @@ function switchFromEditIssue(){
33 31 function backToIssues(){
34 32 $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
35 33 $(".issues_content").show("fade", { direction: "left" }, 150, function() {
36   - $("#edit_issue_dialog").remove();
37   - $("#new_issue_dialog").remove();
  34 + $("#edit_issue_dialog").html("");
  35 + $("#new_issue_dialog").html("");
38 36 $('.add_new').show();
39 37 });
40 38 });
... ...
app/views/issues/edit.js.haml
  Diff comments   View file @17cec05
1 1 :plain
2   - var edit_issue_dialog = $("<div id='edit_issue_dialog'></div>");
3   - edit_issue_dialog.html("#{escape_javascript(render('form'))}");
4   - switchToEditIssue(edit_issue_dialog);
  2 + $("#edit_issue_dialog").html("#{escape_javascript(render('form'))}");
  3 + switchToEditIssue();
5 4  
... ...
app/views/issues/index.html.haml
  Diff comments   View file @17cec05
... ... @@ -58,6 +58,8 @@
58 58 %ul#issues-table.unstyled.issues_table
59 59 = render "issues"
60 60  
  61 +#new_issue_dialog
  62 +#edit_issue_dialog
61 63  
62 64 :javascript
63 65 $(function(){
... ...
app/views/issues/new.js.haml
  Diff comments   View file @17cec05
1 1 :plain
2   - var new_issue_dialog = $("<div id='new_issue_dialog'></div>");
3   - new_issue_dialog.html("#{escape_javascript(render('form'))}");
4   - switchToNewIssue(new_issue_dialog);
  2 + $("#new_issue_dialog").html("#{escape_javascript(render('form'))}");
  3 + switchToNewIssue();
... ...