Merge branch '5.0/jump-to-unread-on-scroll' into 5.0-trunk

1 files changed, 12 insertions, 0 deletions

diff --git a/share/html/Ticket/Elements/ScrollShowHistory b/share/html/Ticket/Elements/ScrollShowHistory
index 95ece700c4..5d900e1c52 100644
--- a/share/html/Ticket/Elements/ScrollShowHistory
+++ b/share/html/Ticket/Elements/ScrollShowHistory
@@ -214,5 +214,17 @@ jQuery(function(){
     });
 
     loadHistoryPage();
+
+    // Catch clicks on unread messages buttons and load any messages not loaded "on scroll"
+    jQuery('.new-messages-buttons > a').on('click', function (e) {
+        var link = jQuery(this);
+        if ( link[0].hash ) {
+            hash = link[0].hash;
+            lastTransactionId = null;
+            loadHistoryPage();
+        }
+        return true;
+    });
+
 });
 </script>