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

merge request show page refactored

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-13 20:40:45 +02:00 • committed by Dmitriy Zaporozhets
parent e4bd6442a9
commit 3a50b6cac9
9 changed files with 105 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/assets/javascripts/merge_requests.js
View file

@ -1,5 +1,5 @@
var MergeRequest = {
diff_loaded: false,
diffs_loaded: false,
commits_loaded: false,
init:
@ -9,12 +9,25 @@ var MergeRequest = {
$(this).addClass("active");
});
$(".merge-tabs a.merge-notes-tab").live("click", function() {
$(".merge-request-commits, .merge-request-diffs").hide();
$(".merge-request-notes").show();
});
$(".merge-tabs a.merge-commits-tab").live("click", function() {
if(MergeRequest.commits_loaded) {
$(".merge-request-commits").show();
} else {
if(!MergeRequest.commits_loaded) {
MergeRequest.loadCommits();
}
$(".merge-request-notes, .merge-request-diffs").hide();
$(".merge-request-commits").show();
});
$(".merge-tabs a.merge-diffs-tab").live("click", function() {
if(!MergeRequest.diffs_loaded) {
MergeRequest.loadDiff();
}
$(".merge-request-notes, .merge-request-commits").hide();
$(".merge-request-diffs").show();
});
},
@ -23,14 +36,24 @@ var MergeRequest = {
$(".dashboard-loader").show();
$.ajax({
type: "GET",
url: location.href + "/commits",
url: $(".merge-commits-tab").attr("data-url"),
complete: function(){
MergeRequest.commits_loaded = true;
$(".merge-request-notes, .merge-request-diffs").hide();
$(".dashboard-loader").hide()},
dataType: "script"});
},
loadDiff:
function() {
$(".dashboard-loader").show();
$.ajax({
type: "GET",
url: $(".merge-diffs-tab").attr("data-url"),
complete: function(){
MergeRequest.diffs_loaded = true;
$(".merge-request-notes, .merge-request-commits").hide();
$(".dashboard-loader").hide()},
dataType: "script"});
}
}