aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
committerThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
commitd1cae2da2abc3a602f682114bc02cce08a7e7578 (patch)
treeef3147f9db85bdde8e26303971a40d86e10bb508 /js/main.js
parent33696cc8392daeb08d011aa3b1209f3b121898ea (diff)
parentb86253c655f974920c4d3de0915611a7e66c7336 (diff)
downloadvolse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js/main.js')
-rw-r--r--js/main.js16
1 files changed, 16 insertions, 0 deletions
diff --git a/js/main.js b/js/main.js
index f1a50e28a..8b1114d19 100644
--- a/js/main.js
+++ b/js/main.js
@@ -343,6 +343,8 @@
function updateConvItems(mode,data) {
+ var expanded_comments = false;
+
if(mode === 'update') {
prev = 'threads-begin';
@@ -353,7 +355,14 @@ function updateConvItems(mode,data) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
+// expanded_comments = false;
+// $('.collapsed-comments',this).each(function() {
+// if($(this).is(':visible'))
+// expanded_comments = this;
+// });
$('#' + prev).after($(this));
+// if(expanded_comments)
+// $(expanded_comments).show();
$(".autotime").timeago();
// divgrow doesn't prevent itself from attaching a second (or 500th)
// "show more" div to a content region - it also has a few other
@@ -365,7 +374,14 @@ function updateConvItems(mode,data) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
+// expanded_comments = false;
+// $('.collapsed-comments',this).each(function() {
+// if($(this).is(':visible'))
+// expanded_comments = this;
+// });
$('#' + ident).replaceWith($(this));
+// if(expanded_comments)
+// $(expanded_comments).show();
$(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });