Merge remote-tracking branch 'upstream/2023.09-rc' into user-defined-channels

[friendica.git] / view / js / main.js

diff --git a/view/js/main.js b/view/js/main.js
index 3e0f8307a2b6b81123c4709f78e98e04cf0850ea..c55f85d9177e94d1a3da56b55e05459741db2698 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -378,16 +378,10 @@ $(function() {
 
        // Allow folks to stop the ajax page updates with the pause/break key
        $(document).keydown(function(event) {
-               if (event.keyCode == '8') {
-                       var target = event.target || event.srcElement;
-                       if (!/input|textarea/i.test(target.nodeName)) {
-                               return false;
-                       }
-               }
-
-               if (event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
+               // Pause/Break or Ctrl + Space
+               if (event.which === 19 || (!event.shiftKey && !event.altKey && event.ctrlKey && event.which === 32)) {
                        event.preventDefault();
-                       if (stopped == false) {
+                       if (stopped === false) {
                                stopped = true;
                                if (event.ctrlKey) {
                                        totStopped = true;
@@ -506,7 +500,7 @@ function NavUpdate() {
                                $('nav').trigger('nav-update', data.result);
 
                                // start live update
-                               ['network', 'profile', 'community', 'notes', 'display', 'contact'].forEach(function (src) {
+                               ['network', 'profile', 'channel', 'community', 'notes', 'display', 'contact'].forEach(function (src) {
                                        if ($('#live-' + src).length) {
                                                liveUpdate(src);
                                        }
@@ -608,6 +602,26 @@ function liveUpdate(src) {
                update_url += '&max_id=' + getUrlParameter('max_id');
        }
 
+       match = $("span.received").first();
+       if (match.length > 0) {
+               update_url += '&first_received=' + match[0].innerHTML;
+       }
+
+       match = $("span.created").first();
+       if (match.length > 0) {
+               update_url += '&first_created=' + match[0].innerHTML;
+       }
+
+       match = $("span.commented").first();
+       if (match.length > 0) {
+               update_url += '&first_commented=' + match[0].innerHTML;
+       }
+
+       match = $("span.uriid").first();
+       if (match.length > 0) {
+               update_url += '&first_uriid=' + match[0].innerHTML;
+       }
+
        $.get(update_url, function(data) {
                in_progress = false;
                update_item = 0;