diff options
| author | friendica <info@friendica.com> | 2014-12-29 23:58:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-29 23:58:14 -0800 |
| commit | 2f650b74d35335815c48537cd03c81cc92a3c4f8 (patch) | |
| tree | d209405166df963a8cca626fb53dc69a9e0b3872 /view/js/main.js | |
| parent | 5cfe0511391e391d46b91efaa8df3501d498fd21 (diff) | |
| parent | 9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6 (diff) | |
| download | volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.tar.gz volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.tar.bz2 volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/view/js/main.js b/view/js/main.js index f979f6b6f..8c48bbb72 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -468,7 +468,7 @@ function updateConvItems(mode,data) { $('#' + prev).after($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } else { $('img',this).each(function() { @@ -479,7 +479,7 @@ function updateConvItems(mode,data) { $('#' + ident).replaceWith($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } prev = ident; }); @@ -510,7 +510,7 @@ function updateConvItems(mode,data) { $('#threads-end').before($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } else { $('img',this).each(function() { @@ -521,7 +521,7 @@ function updateConvItems(mode,data) { $('#' + ident).replaceWith($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } }); @@ -555,7 +555,7 @@ function updateConvItems(mode,data) { $('#' + prev).after($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } prev = ident; @@ -844,10 +844,12 @@ function updateConvItems(mode,data) { } function filestorage(event,nick,id) { + $('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active'); $('#perms-panel-' + last_filestorage_id).hide().html(''); $('#file-edit-' + id).spin('tiny'); delete acl; $.get('filestorage/' + nick + '/' + id + '/edit', function(data) { + $('#cloud-index-' + id).addClass('cloud-index-active'); $('#perms-panel-' + id).html(data).show(); $('#file-edit-' + id).spin(false); last_filestorage_id = id; |