aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-29 18:47:36 -0700
committerfriendica <info@friendica.com>2013-10-29 18:47:36 -0700
commitdb83080f4d78fc6a9887710db146bf503aaf81c5 (patch)
tree0147081563b0d7968fbccd6c668b43d16c3ded5b /js
parent75ba7ae1166562f48356b445b10cce2e57a42f4a (diff)
parent5570ae0101185101484528ad2609a8d68b430403 (diff)
downloadvolse-hubzilla-db83080f4d78fc6a9887710db146bf503aaf81c5.tar.gz
volse-hubzilla-db83080f4d78fc6a9887710db146bf503aaf81c5.tar.bz2
volse-hubzilla-db83080f4d78fc6a9887710db146bf503aaf81c5.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'js')
-rw-r--r--js/main.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js
index 79f11f424..b29b678f4 100644
--- a/js/main.js
+++ b/js/main.js
@@ -576,8 +576,8 @@ function updateConvItems(mode,data) {
updateConvItems(update_mode,data);
$("#page-spinner").spin(false);
$("#profile-jot-text-loading").spin(false);
- if(timer) clearTimeout(timer);
- timer = setTimeout(NavUpdate,10);
+// if(timer) clearTimeout(timer);
+// timer = setTimeout(NavUpdate,10);
});