summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-15 01:15:02 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-15 01:15:02 +0200
commit8d493019c4d2205a1020e6e72ca4f9a92534193f (patch)
treecf3706f655c065cc27996506dd231690644c245c /app/assets/javascripts
parentef396d08fc9af54f0e2c69da27d64e13064e0dfb (diff)
downloadgitlab-ce-8d493019c4d2205a1020e6e72ca4f9a92534193f.tar.gz
Show commits for merge request immediatly
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/merge_requests.js27
1 files changed, 3 insertions, 24 deletions
diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js
index af59634f7ba..78850480792 100644
--- a/app/assets/javascripts/merge_requests.js
+++ b/app/assets/javascripts/merge_requests.js
@@ -10,40 +10,19 @@ var MergeRequest = {
});
$(".tabs a.merge-notes-tab").live("click", function() {
- $(".merge-request-commits, .merge-request-diffs").hide();
+ $(".merge-request-diffs").hide();
$(".merge-request-notes").show();
});
- $(".tabs a.merge-commits-tab").live("click", function() {
- if(!MergeRequest.commits_loaded) {
- MergeRequest.loadCommits();
- }
- $(".merge-request-notes, .merge-request-diffs").hide();
- $(".merge-request-commits").show();
- });
-
$(".tabs a.merge-diffs-tab").live("click", function() {
if(!MergeRequest.diffs_loaded) {
MergeRequest.loadDiff();
}
- $(".merge-request-notes, .merge-request-commits").hide();
+ $(".merge-request-notes").hide();
$(".merge-request-diffs").show();
});
},
- loadCommits:
- function() {
- $(".dashboard-loader").show();
- $.ajax({
- type: "GET",
- 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();
@@ -52,7 +31,7 @@ var MergeRequest = {
url: $(".merge-diffs-tab").attr("data-url"),
complete: function(){
MergeRequest.diffs_loaded = true;
- $(".merge-request-notes, .merge-request-commits").hide();
+ $(".merge-request-notes").hide();
$(".dashboard-loader").hide()},
dataType: "script"});
}