Remove unused variable in Model\Item

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

diff --git a/view/js/main.js b/view/js/main.js
index 4c55546aaacd0c4d9846814ccf85db5feb3b3baa..95e7b1542edf4b38b7c585dfdfe73f020b0b2b8b 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -24,7 +24,7 @@ function openClose(theID) {
 }
 
 function openMenu(theID) {
-       var el = document.getElementById(theID)
+       var el = document.getElementById(theID);
 
        if (el) {
                el.style.display = "block";
@@ -81,6 +81,11 @@ $(function() {
                        Dialog.doImageBrowser("comment", id);
                        return;
                }
+
+               if (bbcode == "imgprv") {
+                       bbcode = "img";
+               }
+
                insertFormatting(bbcode, id);
        });
 
@@ -302,7 +307,14 @@ $(function() {
                $('#nav-notifications-menu').perfectScrollbar('update');
        });
 
-       NavUpdate();
+       // Asynchronous calls are deferred until the very end of the page load to ease on slower connections
+       window.addEventListener("load", function(){
+               NavUpdate();
+               if (typeof acl !== 'undefined') {
+                       acl.get(0, 100);
+               }
+       });
+
        // Allow folks to stop the ajax page updates with the pause/break key
        $(document).keydown(function(event) {
                if (event.keyCode == '8') {
@@ -378,7 +390,7 @@ function NavUpdate() {
                                $('nav').trigger('nav-update', data.result);
 
                                // start live update
-                               ['network', 'profile', 'community', 'notes', 'display'].forEach(function (src) {
+                               ['network', 'profile', 'community', 'notes', 'display', 'contact'].forEach(function (src) {
                                        if ($('#live-' + src).length) {
                                                liveUpdate(src);
                                        }
@@ -395,6 +407,47 @@ function NavUpdate() {
        timer = setTimeout(NavUpdate, updateInterval);
 }
 
+function updateConvItems(data) {
+       // add a new thread
+       $('.toplevel_item',data).each(function() {
+               var ident = $(this).attr('id');
+
+               // Add new top-level item.
+               if ($('#' + ident).length == 0 && profile_page == 1) {
+                       $('#' + prev).after($(this));
+
+               // Replace already existing thread.
+               } else {
+                       // Find out if the hidden comments are open, so we can keep it that way
+                       // if a new comment has been posted
+                       var id = $('.hide-comments-total', this).attr('id');
+                       if (typeof id != 'undefined') {
+                               id = id.split('-')[3];
+                               var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
+                       }
+
+                       $('#' + ident).replaceWith($(this));
+
+                       if (typeof id != 'undefined') {
+                               if (commentsOpen) {
+                                       showHideComments(id);
+                               }
+                       }
+               }
+               prev = ident;
+       });
+
+       $('.like-rotator').hide();
+       if (commentBusy) {
+               commentBusy = false;
+               $('body').css('cursor', 'auto');
+       }
+       /* autocomplete @nicknames */
+       $(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
+       /* autocomplete bbcode */
+       $(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
+}
+
 function liveUpdate(src) {
        if ((src == null) || stopped || !profile_uid) {
                $('.like-rotator').hide(); return;
@@ -430,53 +483,14 @@ function liveUpdate(src) {
                update_item = 0;
 
                $('.wall-item-body', data).imagesLoaded(function() {
-                       // add a new thread
-                       $('.toplevel_item',data).each(function() {
-                               var ident = $(this).attr('id');
-
-                               // Add new top-level item.
-                               if ($('#' + ident).length == 0 && profile_page == 1) {
-                                       $('#' + prev).after($(this));
-
-                               // Replace already existing thread.
-                               } else {
-                                       // Find out if the hidden comments are open, so we can keep it that way
-                                       // if a new comment has been posted
-                                       var id = $('.hide-comments-total', this).attr('id');
-                                       if (typeof id != 'undefined') {
-                                               id = id.split('-')[3];
-                                               var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
-                                       }
+                       updateConvItems(data);
 
-                                       $('#' + ident).replaceWith($(this));
+                       document.dispatchEvent(new Event('postprocess_liveupdate'));
 
-                                       if (typeof id != 'undefined') {
-                                               if (commentsOpen) {
-                                                       showHideComments(id);
-                                               }
-                                       }
-                               }
-                               prev = ident;
-                       });
+                       // Update the scroll position.
+                       $(window).scrollTop($(window).scrollTop() + $("section").height() - orgHeight);
                });
-
-               callAddonHooks("postprocess_liveupdate");
-
-               // Update the scroll position.
-               $(window).scrollTop($(window).scrollTop() + $("section").height() - orgHeight);
-
-               $('.like-rotator').hide();
-               if (commentBusy) {
-                       commentBusy = false;
-                       $('body').css('cursor', 'auto');
-               }
-               /* autocomplete @nicknames */
-               $(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
-               /* autocomplete bbcode */
-               $(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
-
        });
-
 }
 
 function imgbright(node) {
@@ -660,6 +674,7 @@ function preview_post() {
                        if (data.preview) {
                                $("#jot-preview-content").html(data.preview);
                                $("#jot-preview-content" + " a").click(function() {return false;});
+                               document.dispatchEvent(new Event('postprocess_liveupdate'));
                        }
                },
                "json"
@@ -718,7 +733,7 @@ function loadScrollContent() {
 
        // get the raw content from the next page and insert this content
        // right before "#conversation-end"
-       $.get('network?mode=raw' + infinite_scroll.reload_uri + '&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_id=' + id + '&page=' + infinite_scroll.pageno, function(data) {
                $("#scroll-loader").hide();
                if ($(data).length > 0) {
                        $(data).insertBefore('#conversation-end');
@@ -726,6 +741,8 @@ function loadScrollContent() {
                } else {
                        $("#scroll-end").fadeIn('normal');
                }
+
+               document.dispatchEvent(new Event('postprocess_liveupdate'));
        });
 }