aboutsummaryrefslogtreecommitdiffstats
path: root/include/main.js
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
commit9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch)
tree073576560eaa6e00266c3e85a5e76df6e1dca032 /include/main.js
parent05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff)
parent18da7efa27fcff8fb2b3b679938954e712427de9 (diff)
downloadvolse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'include/main.js')
-rw-r--r--include/main.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/include/main.js b/include/main.js
index 824f2dfdf..750cce74c 100644
--- a/include/main.js
+++ b/include/main.js
@@ -113,12 +113,18 @@
$.get(update_url,function(data) {
in_progress = false;
+ $('.ccollapse-wrapper',data).each(function() {
+ var ident = $(this).attr('id');
+ if($('#' + ident).length) {
+ $('#' + ident).replaceWith($(this));
+ }
+ });
$('.wall-item-outside-wrapper',data).each(function() {
var ident = $(this).attr('id');
if($('#' + ident).length == 0) {
- $('img',this).each(function() {
- $(this).attr('src',$(this).attr('dst'));
- });
+ $('img',this).each(function() {
+ $(this).attr('src',$(this).attr('dst'));
+ });
$('#' + prev).after($(this));
}
else {
@@ -127,11 +133,9 @@
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
- $('#' + ident + ' ' + '.my-comment-photo').each(function() {
- $(this).attr('src',$(this).attr('dst'));
- });
-
-
+ $('#' + ident + ' ' + '.my-comment-photo').each(function() {
+ $(this).attr('src',$(this).attr('dst'));
+ });
}
prev = ident;
});