Merge pull request #9275 from nupplaphil/task/9235-issue_template

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

diff --git a/view/js/main.js b/view/js/main.js
index af2f8522c8e76341b360447b3b3688480a631225..35a0529a0e0e7e118c71befc5a635a6c28349bfc 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -649,9 +649,15 @@ function imgdull(node) {
 // trickery. This still could cause confusion if the "like" ajax call
 // is delayed and NavUpdate runs before it completes.
 
-function dolike(ident,verb) {
+/**
+ * @param {int}     ident The id of the relevant item
+ * @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) {
        unpause();
        $('#like-rotator-' + ident.toString()).show();
+       verb = un ? 'un' + verb : verb;
        $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate);
        liking = 1;
        force_update = true;
@@ -744,26 +750,23 @@ function getPosition(e) {
 
 var lockvisible = false;
 
-function lockview(event,id) {
+function lockview(event, type, id) {
        event = event || window.event;
        cursor = getPosition(event);
        if (lockvisible) {
-               lockviewhide();
+               lockvisible = false;
+               $('#panel').hide();
        } else {
                lockvisible = true;
-               $.get('lockview/' + id, function(data) {
-                       $('#panel').html(data);
-                       $('#panel').css({'left': cursor.x + 5 , 'top': cursor.y + 5});
-                       $('#panel').show();
+               $.get('permission/tooltip/' + type + '/' + id, function(data) {
+                       $('#panel')
+                               .html(data)
+                               .css({'left': cursor.x + 5 , 'top': cursor.y + 5})
+                               .show();
                });
        }
 }
 
-function lockviewhide() {
-       lockvisible = false;
-       $('#panel').hide();
-}
-
 function post_comment(id) {
        unpause();
        commentBusy = true;
@@ -856,10 +859,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;
@@ -881,16 +880,16 @@ 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(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid, function(data) {
                $("#scroll-loader").hide();
                if ($(data).length > 0) {
                        $(data).insertBefore('#conversation-end');
@@ -934,14 +933,6 @@ function groupChangeMember(gid, cid, sec_token) {
        });
 }
 
-function profChangeMember(gid,cid) {
-       $('body .fakelink').css('cursor', 'wait');
-       $.get('profperm/' + gid + '/' + cid, function(data) {
-                       $('#prof-update-wrapper').html(data);
-                       $('body .fakelink').css('cursor', 'auto');
-       });
-}
-
 function contactgroupChangeMember(checkbox, gid, cid) {
        let url;
        // checkbox.checked is the checkbox state after the click