Added timeout blocker in conversations.

Serubin · May 20, 2017 · 11ddf5c · 11ddf5c
1 parent 9591f9d
commit 11ddf5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/resources/js/Conversations.js b/resources/js/Conversations.js
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-function Conversations(data, elem) {
+function Conversations(data, elem, page) {
     var page_id;
     var $elem;
 
@@ -76,6 +76,12 @@ function Conversations(data, elem) {
 
             Nav();
         }
+
+
+        if(typeof page != "undefined") {
+            page_id = page;
+        }
+
         $refresh_btn.on('click', function() {
             initial_load = true
             $elem.empty();
@@ -96,6 +102,9 @@ function Conversations(data, elem) {
 
     function refreshConversations() {
 
+        if (current_page_id != page_id)
+            return;
+
         handle_ui = updateConversations
         if(initial_load)
             handle_ui = renderConversation

diff --git a/resources/js/Thread.js b/resources/js/Thread.js
@@ -251,7 +251,7 @@ function Thread(data) {
         setTimeout(checkNewMessages, refresh_rate);
         $msg_entry.focus();
 
-        Conversations(null, $("#side-menu-insert"));
+        Conversations(null, $("#side-menu-insert"), page_id);
         $("[data-conversation-list=inserted]").off(); 
 
         // Refresh messages event