diff options
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index f6a009937..4d3b2d770 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -971,7 +971,7 @@ function liveUpdate(notify_id) { var orgHeight = $("#region_2").height(); } - if(page_cache.data && bParam_page == page_cache.page && page_cache.time > (Date.now() - 90000)) { + if(page_cache.data && bParam_page == page_cache.page && page_cache.time > (Date.now() - 180000)) { page_load = false; scroll_next = false; updateConvItems(update_mode,page_cache.data); @@ -1550,7 +1550,7 @@ String.prototype.format = function() { var formatted = this; for (var i = 0; i < arguments.length; i++) { var regexp = new RegExp('\\{'+i+'\\}', 'gi'); - formatted = formatted.replace(regexp, arguments[i]); + formatted = formatted.replace(regexp, ((typeof arguments[i] !== 'undefined') ? arguments[i] : '')); } return formatted; }; @@ -1876,7 +1876,7 @@ function sse_handleNotificationsItems(notifyType, data, replace, followup) { } $(data).each(function() { - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum, encodeURIComponent(this.mids)); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum, encodeURIComponent(this.mids), this.body); notify_menu.append(html); }); |