X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjs%2Fmain.js;h=0b9c1da283e2a526c16f06071494ebb8bf729ecb;hb=ee6699e64103f01731e13dd75bea0adce43c6243;hp=1fe3d162eb31a953385bafdf404e2005b9e297f3;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git diff --git a/view/js/main.js b/view/js/main.js index 1fe3d162eb..0b9c1da283 100644 --- 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); @@ -654,11 +665,11 @@ function imgdull(node) { * @param {string} verb The verb of the action * @param {boolean} un Whether to perform an activity removal instead of creation */ -function dolike(ident, verb, un) { +function doActivityItem(ident, verb, un) { unpause(); $('#like-rotator-' + ident.toString()).show(); verb = un ? 'un' + verb : verb; - $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate); + $.post('item/' + ident.toString() + '/activity/' + verb, NavUpdate); liking = 1; force_update = true; update_item = ident.toString(); @@ -671,49 +682,59 @@ function dosubthread(ident) { liking = 1; } -function dostar(ident) { +function doStar(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); - $.get('starred/' + ident, function(data) { - if (data.match(/1/)) { - $('#starred-' + ident).addClass('starred'); - $('#starred-' + ident).removeClass('unstarred'); + $.post('item/' + ident + '/star') + .then(function(data) { + if (data.state === 1) { + $('#starred-' + ident) + .addClass('starred') + .removeClass('unstarred'); $('#star-' + ident).addClass('hidden'); $('#unstar-' + ident).removeClass('hidden'); } else { - $('#starred-' + ident).addClass('unstarred'); - $('#starred-' + ident).removeClass('starred'); + $('#starred-' + ident) + .addClass('unstarred') + .removeClass('starred'); $('#star-' + ident).removeClass('hidden'); $('#unstar-' + ident).addClass('hidden'); } + }) + .always(function () { $('#like-rotator-' + ident).hide(); }); } -function dopin(ident) { +function doPin(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); - $.get('pinned/' + ident, function(data) { - if (data.match(/1/)) { - $('#pinned-' + ident).addClass('pinned'); - $('#pinned-' + ident).removeClass('unpinned'); + $.post('item/' + ident + '/pin') + .then(function(data) { + if (data.state === 1) { + $('#pinned-' + ident) + .addClass('pinned') + .removeClass('unpinned'); $('#pin-' + ident).addClass('hidden'); $('#unpin-' + ident).removeClass('hidden'); } else { - $('#pinned-' + ident).addClass('unpinned'); - $('#pinned-' + ident).removeClass('pinned'); + $('#pinned-' + ident) + .addClass('unpinned') + .removeClass('pinned'); $('#pin-' + ident).removeClass('hidden'); $('#unpin-' + ident).addClass('hidden'); } + }) + .always(function () { $('#like-rotator-' + ident).hide(); }); } -function doignore(ident) { +function doIgnoreThread(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); - $.get('item/ignore/' + ident, function(data) { - if (data === 1) { + $.post('item/' + ident + '/ignore', function(data) { + if (data.state === 1) { $('#ignored-' + ident) .addClass('ignored') .removeClass('unignored'); @@ -859,10 +880,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; @@ -893,16 +910,29 @@ function loadScrollContent() { // 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_uriid=' + uriid + '&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; }); }