summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-21 22:04:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-21 22:04:01 +0200
commit1c22d4f50f6a89c85b17e6b5351bcf351bf35e27 (patch)
treef0ff8a43b2b4127bcb6d71b21d311ce4f8be2d35 /app/assets/javascripts
parentce8eba89135c901fd4f04f1b2385bdbd23f48766 (diff)
downloadgitlab-ce-1c22d4f50f6a89c85b17e6b5351bcf351bf35e27.tar.gz
Help message for wiki, styled projects page
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/merge_requests.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js
index 78850480792..1c262afc641 100644
--- a/app/assets/javascripts/merge_requests.js
+++ b/app/assets/javascripts/merge_requests.js
@@ -9,17 +9,19 @@ var MergeRequest = {
$(this).parent().addClass("active");
});
- $(".tabs a.merge-notes-tab").live("click", function() {
+ $(".tabs a.merge-notes-tab").live("click", function(e) {
$(".merge-request-diffs").hide();
$(".merge-request-notes").show();
+ e.preventDefault();
});
- $(".tabs a.merge-diffs-tab").live("click", function() {
+ $(".tabs a.merge-diffs-tab").live("click", function(e) {
if(!MergeRequest.diffs_loaded) {
MergeRequest.loadDiff();
}
$(".merge-request-notes").hide();
$(".merge-request-diffs").show();
+ e.preventDefault();
});
},