From 87bd7965ac910bdf84e25bd555508c342791b875 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 06 2017 20:44:56 +0000
Subject: [PATCH 1/2] Do not update the hash in the URL for every tabs on the PR page


We're only interested to update the hash for the diff and commits tabs
for the other ones we do not want to update the hash.

Fixes https://pagure.io/pagure/issue/2068

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 58b62c2..c2918b3 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -1274,6 +1274,7 @@ function updateHighlight(onload) {
     }
   }
 }
+
 $(document).ready(function () {
   updateHighlight(true)
  {% if form %}
@@ -1370,7 +1371,9 @@ $(document).ready(function () {
     $("#initial_comment").atwho(issueAndPrConfig);
   });
 } );
+
 $(window).on('hashchange', updateHighlight);
+
 var selected = [];
 $("[data-line-number]").click(function (ev) {
   var line = $(this).attr('data-line-number');
@@ -1392,14 +1395,18 @@ $("[data-line-number]").click(function (ev) {
 // Update hash links in the addressbar according to which tab is clicked
 // on the PR page.
 $(document).on('click', '#pr-tabs a', function() {
-  window.location.hash = $(this).attr('href');
+  if ($(this).text().trim() == 'Comments' || $(this).text().trim() == 'Patch'){
+    window.location.hash = '';
+  }  else {
+    window.location.hash = $(this).attr('href');
+  }
 });
 
 // Show an icon to open the changed file, when the user hovers over the
 // @@ -x,y +x,y @@ line in the diff. Clicking this icon opens the file (at the
 // relevant line number) in a new tab.
 $(document).on("mouseenter", "td.cell2", function(){
-	$(this).find("a.open_changed_file_icon_wrap").css('visibility', 'visible');
+    $(this).find("a.open_changed_file_icon_wrap").css('visibility', 'visible');
 });
 $(document).on("mouseleave", "td.cell2", function() {
   $(this).find("a.open_changed_file_icon_wrap").css('visibility', 'hidden');

From d5c45873fb03d87a5ce48c9950ac139c3b4e7099 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 06 2017 20:44:56 +0000
Subject: [PATCH 2/2] Move checking the merge status into its own function and some style fixes


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index c2918b3..8921620 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -910,12 +910,59 @@ function setup_reply_btns() {
 };
 
 
-  function showTab(){
-   $('#pr-tabs a[href="#request_diff"]').tab('show')
-  }
+function showTab(){
+  $('#pr-tabs a[href="#request_diff"]').tab('show')
+}
 
+function show_merge_status(){
+  function process_response(res) {
+      $('#spinner').hide();
+      if (res.code == 'FFORWARD'){
+        $('#merge_btn').addClass("btn-success");
+        $('#merge-alert').addClass("alert-success");
+        $('#merge-alert-message').append(res.message);
+        $('#merge-alert').show();
+      }
+      else if (res.code == 'MERGE') {
+        $('#merge_btn').addClass("btn-warning");
+        $('#merge-alert').addClass("alert-warning");
+        $('#merge-alert-message').append(res.message);
+        $('#merge-alert').show();
+      }
+      else if (res.code == 'CONFLICTS') {
+        $('#merge_btn').hide();
+        $('#merge-alert').addClass("alert-danger");
+        $('#merge-alert-message').append(res.message);
+        $('#merge-alert').show();
+      }
+      else if (res.code == 'NO_CHANGE') {
+        $('#merge_btn').hide();
+        $('#merge-alert').addClass("alert-info");
+        $('#merge-alert-message').append(res.message);
+        $('#merge-alert').show();
+      }
+  };
+  $('#spinner').show();
+  $.ajax({
+    url: '{{ url_for("internal_ns.mergeable_request_pull") }}' ,
+    type: 'POST',
+    data: {
+      requestid: "{{ pull_request.uid }}",
+      csrf_token: "{{ mergeform.csrf_token.current_token }}",
+    },
+    dataType: 'json',
+    success: function(res) {
+      process_response(res)
+    },
+    error: function(res) {
+      process_response(res.responseJSON);
+      $('#merge_btn').attr("disabled", "disabled");
+    }
+  });
+  return false;
+}
 
- $(document).ready(function() {
+$(document).ready(function() {
 
   $(".inline-comments").hide();
   $( ".inline-btn" ).click(function() {
@@ -1073,53 +1120,7 @@ function setup_reply_btns() {
   });
 
   {% if pull_request.status == 'Open' %}
-  $(function(){
-    function process_response(res) {
-        $('#spinner').hide();
-        if (res.code == 'FFORWARD'){
-          $('#merge_btn').addClass("btn-success");
-          $('#merge-alert').addClass("alert-success");
-          $('#merge-alert-message').append(res.message);
-          $('#merge-alert').show();
-        }
-        else if (res.code == 'MERGE') {
-          $('#merge_btn').addClass("btn-warning");
-          $('#merge-alert').addClass("alert-warning");
-          $('#merge-alert-message').append(res.message);
-          $('#merge-alert').show();
-        }
-        else if (res.code == 'CONFLICTS') {
-          $('#merge_btn').hide();
-          $('#merge-alert').addClass("alert-danger");
-          $('#merge-alert-message').append(res.message);
-          $('#merge-alert').show();
-        }
-        else if (res.code == 'NO_CHANGE') {
-          $('#merge_btn').hide();
-          $('#merge-alert').addClass("alert-info");
-          $('#merge-alert-message').append(res.message);
-          $('#merge-alert').show();
-        }
-    };
-    $('#spinner').show();
-    $.ajax({
-      url: '{{ url_for("internal_ns.mergeable_request_pull") }}' ,
-      type: 'POST',
-      data: {
-        requestid: "{{ pull_request.uid }}",
-        csrf_token: "{{ mergeform.csrf_token.current_token }}",
-      },
-      dataType: 'json',
-      success: function(res) {
-        process_response(res)
-      },
-      error: function(res) {
-        process_response(res.responseJSON);
-        $('#merge_btn').attr("disabled", "disabled");
-      }
-    });
-    return false;
-  });
+    show_merge_status()
   {% endif %}
 
 {% endif %}
@@ -1146,12 +1147,12 @@ $('#assignee').selectize({
   }
 });
 
-  $( ".editmetadatatoggle" ).click(
-    function() {
-      $( ".issue-metadata-form" ).toggle();
-      $( ".issue-metadata-display" ).toggle();
-    }
-  );
+$( ".editmetadatatoggle" ).click(
+  function() {
+    $( ".issue-metadata-form" ).toggle();
+    $( ".issue-metadata-display" ).toggle();
+  }
+);
 
 function set_ui_for_comment(setting){
   console.log(setting)