aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-07-10 19:30:10 +0100
committerThomas Willingham <founder@kakste.com>2013-07-10 19:30:10 +0100
commit085be3a16f704a3f89bbe4d795c9ca915cc26e8a (patch)
treecd0a1b608630d5e819df221ed84a0fbd3755fc2f /js
parentd065135d909bf876f4c305d303de7642657f7e3e (diff)
parent72d737cc82f5987791c9ceba0c8b99a505886274 (diff)
downloadvolse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.tar.gz
volse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.tar.bz2
volse-hubzilla-085be3a16f704a3f89bbe4d795c9ca915cc26e8a.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js')
-rw-r--r--js/main.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/main.js b/js/main.js
index 161068310..9eb9c7946 100644
--- a/js/main.js
+++ b/js/main.js
@@ -351,9 +351,12 @@ function updateConvItems(mode,data) {
var ident = $(this).attr('id');
var commentWrap = $('#'+ident+' .collapsed-comments').attr('id');
- var itmId = commentWrap.replace('collapsed-comments-','');
+ var itmId = 0;
var isVisible = false;
+ if(typeof commentWrap !== 'undefined')
+ itmId = commentWrap.replace('collapsed-comments-','');
+
if($('#' + ident).length == 0 && profile_page == 1) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));