Improved thread loading speeds

Serubin · May 14, 2017 · 524da26 · 524da26
1 parent c8c95e6
commit 524da26
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/resources/js/Conversations.js b/resources/js/Conversations.js
@@ -51,31 +51,31 @@ function Conversations(data, elem) {
             $("[data-conversation-list=true]").html("")
                     .removeAttr("data-conversations-list");
 
-        page_id = "conversationlist" + new Date();
-        current_page_id = page_id;
-
-        $back_btn.hide(); // Hide back button by default
-        $more_btn.hide(); // Hide back button by default
-        $expand_btn.css("display", "") // Show expand button by default
-
-        // Set colors
-        $toolbar.css("background-color", color);
-        $navd_title.css("background-color", colorDark);
-        $navd_subtitle.css("background-color", colorDark);
-
-        $("meta[name=theme-color]").attr("content", colorDark);
-
-        // Set page title
-        document.title = "Pulse";
-        $toolbar_title.html("Pulse");
-        $navd_title.html(localStorage.getItem("name"));
-        $navd_subtitle.html(
-            formatPhoneNumber(localStorage.getItem("phone_number"))
-        );
-
-        if(typeof elem == "undefined") 
+        if(typeof elem == "undefined") {
+            page_id = "conversationlist" + new Date();
+            current_page_id = page_id;
+
+            $back_btn.hide(); // Hide back button by default
+            $more_btn.hide(); // Hide back button by default
+            $expand_btn.css("display", "") // Show expand button by default
+
+            // Set colors
+            $toolbar.css("background-color", color);
+            $navd_title.css("background-color", colorDark);
+            $navd_subtitle.css("background-color", colorDark);
+
+            $("meta[name=theme-color]").attr("content", colorDark);
+
+            // Set page title
+            document.title = "Pulse";
+            $toolbar_title.html("Pulse");
+            $navd_title.html(localStorage.getItem("name"));
+            $navd_subtitle.html(
+                formatPhoneNumber(localStorage.getItem("phone_number"))
+            );
+            
             Nav();
-
+        }
         $refresh_btn.on('click', function() {
             initial_load = true
             $elem.empty();

diff --git a/resources/js/Thread.js b/resources/js/Thread.js
@@ -81,9 +81,7 @@ function Thread(data) {
 
     function constructor() {
 
-        Conversations(null, $("#side-menu-insert"));
-        $("[data-conversation-list=inserted]").off(); 
-
+
         page_id = "thread" + conversation_id + new Date();
         current_page_id = page_id;
 
@@ -266,6 +264,9 @@ function Thread(data) {
         setTimeout(checkNewMessages, refresh_rate);
         $msg_entry.focus();
 
+        Conversations(null, $("#side-menu-insert"));
+        $("[data-conversation-list=inserted]").off(); 
+
     }
 
     function checkNewMessages() {