deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Fixes #1830
This commit is contained in:
Riyad Preukschas 2012-10-27 17:35:15 +02:00
parent 2f5e44a02d
commit 17cec05087
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/issues.js
View file

@ -1,6 +1,5 @@
function switchToNewIssue(form){ function switchToNewIssue(){
$(".issues_content").hide("fade", { direction: "left" }, 150, function(){ $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
$(".issues_content").after(form);
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen(); $('select#issue_milestone_id').chosen();
$("#new_issue_dialog").show("fade", { direction: "right" }, 150); $("#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").hide("fade", { direction: "left" }, 150, function(){
$(".issues_content").after(form);
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen(); $('select#issue_milestone_id').chosen();
$("#edit_issue_dialog").show("fade", { direction: "right" }, 150); $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
@ -33,8 +31,8 @@ function switchFromEditIssue(){
function backToIssues(){ function backToIssues(){
$("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){ $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
$(".issues_content").show("fade", { direction: "left" }, 150, function() { $(".issues_content").show("fade", { direction: "left" }, 150, function() {
$("#edit_issue_dialog").remove(); $("#edit_issue_dialog").html("");
$("#new_issue_dialog").remove(); $("#new_issue_dialog").html("");
$('.add_new').show(); $('.add_new').show();
}); });
}); });

5
app/views/issues/edit.js.haml
View file

@ -1,5 +1,4 @@
:plain :plain
var edit_issue_dialog = $("<div id='edit_issue_dialog'></div>"); $("#edit_issue_dialog").html("#{escape_javascript(render('form'))}");
edit_issue_dialog.html("#{escape_javascript(render('form'))}"); switchToEditIssue();
switchToEditIssue(edit_issue_dialog);

2
app/views/issues/index.html.haml
View file

@ -58,6 +58,8 @@
%ul#issues-table.unstyled.issues_table %ul#issues-table.unstyled.issues_table
= render "issues" = render "issues"
#new_issue_dialog
#edit_issue_dialog
:javascript :javascript
$(function(){ $(function(){

5
app/views/issues/new.js.haml
View file

@ -1,4 +1,3 @@
:plain :plain
var new_issue_dialog = $("<div id='new_issue_dialog'></div>"); $("#new_issue_dialog").html("#{escape_javascript(render('form'))}");
new_issue_dialog.html("#{escape_javascript(render('form'))}"); switchToNewIssue();
switchToNewIssue(new_issue_dialog);