Merge pull request #9731 from MrPetovan/task/various-theme-changes

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

diff --git a/view/js/main.js b/view/js/main.js
index 36c9cbb88d75dd0c9e3b12f3b2bc0a41b1f2beb2..a0ffea3718222a8aef9664f0f18eb9a13b92e86d 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -175,6 +175,17 @@ $(function() {
                $(textarea).trigger('change');
        });
 
+       $(".comment-edit-wrapper textarea, .wall-item-comment-wrapper textarea")
+               .editor_autocomplete(baseurl + '/search/acl')
+               .bbco_autocomplete('bbcode');
+
+       // Ensures asynchronously-added comment forms recognize mentions, tags and BBCodes as well
+       document.addEventListener("postprocess_liveupdate", function() {
+               $(".comment-edit-wrapper textarea, .wall-item-comment-wrapper textarea")
+                       .editor_autocomplete(baseurl + '/search/acl')
+                       .bbco_autocomplete('bbcode');
+       });
+
        /* popup menus */
        function close_last_popup_menu() {
                if (last_popup_menu) {
@@ -536,7 +547,7 @@ function updateConvItems(data) {
                if ($('#' + ident).length === 0
                        && (!getUrlParameter('page')
                                && !getUrlParameter('max_id')
-                               && !getUrlParameter('since_id')
+                               && !getUrlParameter('min_id')
                                || getUrlParameter('page') === '1'
                        )
                ) {
@@ -568,10 +579,6 @@ function updateConvItems(data) {
                commentBusy = false;
                $('body').css('cursor', 'auto');
        }
-       /* autocomplete @nicknames */
-       $(".comment-edit-form  textarea").editor_autocomplete(baseurl + '/search/acl');
-       /* autocomplete bbcode */
-       $(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
 }
 
 function liveUpdate(src) {
@@ -609,8 +616,8 @@ function liveUpdate(src) {
        if (getUrlParameter('page')) {
                update_url += '&page=' + getUrlParameter('page');
        }
-       if (getUrlParameter('since_id')) {
-               update_url += '&since_id=' + getUrlParameter('since_id');
+       if (getUrlParameter('min_id')) {
+               update_url += '&min_id=' + getUrlParameter('min_id');
        }
        if (getUrlParameter('max_id')) {
                update_url += '&max_id=' + getUrlParameter('max_id');
@@ -620,6 +627,10 @@ function liveUpdate(src) {
                in_progress = false;
                update_item = 0;
 
+               if ($('.wall-item-body', data).length == 0) {
+                       return;
+               }
+
                $('.wall-item-body', data).imagesLoaded(function() {
                        updateConvItems(data);
 
@@ -859,10 +870,6 @@ function loadScrollContent() {
 
        $("#scroll-loader").fadeIn('normal');
 
-       // the page number to load is one higher than the actual
-       // page number
-       infinite_scroll.pageno+=1;
-
        match = $("span.received").last();
        if (match.length > 0) {
                received = match[0].innerHTML;
@@ -884,25 +891,38 @@ function loadScrollContent() {
                commented = "0000-00-00 00:00:00";
        }
 
-       match = $("span.id").last();
+       match = $("span.uriid").last();
        if (match.length > 0) {
-               id = match[0].innerHTML;
+               uriid = match[0].innerHTML;
        } else {
-               id = "0";
+               uriid = "0";
        }
 
        // get the raw content from the next page and insert this content
        // right before "#conversation-end"
-       $.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_id=' + id + '&page=' + infinite_scroll.pageno, function(data) {
+       $.get({
+               url: infinite_scroll.reload_uri,
+               data: {
+                       'mode'          : 'raw',
+                       'last_received' : received,
+                       'last_commented': commented,
+                       'last_created'  : created,
+                       'last_uriid'    : uriid
+               }
+       })
+       .done(function(data) {
                $("#scroll-loader").hide();
                if ($(data).length > 0) {
                        $(data).insertBefore('#conversation-end');
-                       lockLoadContent = false;
                } else {
                        $("#scroll-end").fadeIn('normal');
                }
 
                document.dispatchEvent(new Event('postprocess_liveupdate'));
+       })
+       .always(function () {
+               $("#scroll-loader").hide();
+               lockLoadContent = false;
        });
 }