diff options
| author | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-22 15:42:01 -0800 |
| commit | 95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa (patch) | |
| tree | ced1f9a8bc579f85e0b74f76239de76ea95cedc0 /js | |
| parent | ed725df5f1c1ea2484c689283e93f8f825591384 (diff) | |
| parent | b602203e6c9ae4b380fa615450e1a573f47cb756 (diff) | |
| download | volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.gz volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.tar.bz2 volse-hubzilla-95b4bc55bf54c3dffdb714b8a1d8f38cc78355aa.zip | |
Merge branch 'master' into notify
Diffstat (limited to 'js')
| -rw-r--r-- | js/acl.js | 16 | ||||
| -rw-r--r-- | js/main.js | 22 |
2 files changed, 29 insertions, 9 deletions
@@ -171,6 +171,9 @@ ACL.prototype.update_view = function(){ $('.profile-jot-net input').attr('disabled', 'disabled'); $('#profile-jot-desc').html(' '); } + $("#acl-list-content .acl-list-item").each(function(){ + $(this).removeClass("groupshow grouphide"); + }); $("#acl-list-content .acl-list-item").each(function(){ itemid = $(this).attr('id'); @@ -194,8 +197,17 @@ ACL.prototype.update_view = function(){ uclass="grouphide"; } - $(that.group_uids[id]).each(function(i,v){ - $("#c"+v).removeClass("groupshow grouphide").addClass(uclass); + $(that.group_uids[id]).each(function(i,v) { + if(uclass == "grouphide") + $("#c"+v).removeClass("groupshow"); + if(uclass != "") { + var cls = $("#c"+v).attr('class'); + if( cls == undefined) + return true; + var hiding = cls.indexOf('grouphide'); + if(hiding == -1) + $("#c"+v).addClass(uclass); + } }); break; diff --git a/js/main.js b/js/main.js index 3f84ae6c4..96c7fa642 100644 --- a/js/main.js +++ b/js/main.js @@ -241,26 +241,34 @@ $('.tread-wrapper',data).each(function() { var ident = $(this).attr('id'); + if($('#' + ident).length == 0 && profile_page == 1) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); $('#' + prev).after($(this)); } + else { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); + $('#' + ident).replaceWith($(this)); + } prev = ident; }); // reset vars for inserting individual items - prev = 'live-' + src; + /* prev = 'live-' + src; $('.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')); - }); - $('#' + prev).after($(this)); + + if($('#' + ident).length == 0 && prev != 'live-' + src) { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); + $('#' + prev).after($(this)); } else { $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); @@ -275,7 +283,7 @@ } prev = ident; }); - + */ $('.like-rotator').hide(); if(commentBusy) { commentBusy = false; |