diff options
author | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
commit | f1518a54dffb4a309da3952e154b71d4bc9482f8 (patch) | |
tree | b6faeec269eb8904c5c8f42732e5466758fdeb0e /core/js/share.js | |
parent | 65d802329f8307cd010a306073d2d3ffd7dc7b74 (diff) | |
parent | de949b1caa4491a8016ed5e609fc781526fea54d (diff) | |
download | nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.tar.gz nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.zip |
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
Diffstat (limited to 'core/js/share.js')
-rw-r--r-- | core/js/share.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/share.js b/core/js/share.js index a0ae39fffed..e7fb26d0ed8 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -22,9 +22,9 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var file = $('tr').filterAttr('data-id', item); + var file = $('tr[data-id="'+item+'"]'); if (file.length > 0) { - var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); + var action = $(file).find('.fileactions .action[data-action="Share"]'); var img = action.find('img').attr('src', image); action.addClass('permanent'); action.html(' '+t('core', 'Shared')).prepend(img); @@ -36,7 +36,7 @@ OC.Share={ // Search for possible parent folders that are shared while (path != last) { if (path == data['path']) { - var actions = $('.fileactions .action').filterAttr('data-action', 'Share'); + var actions = $('.fileactions .action[data-action="Share"]'); $.each(actions, function(index, action) { var img = $(action).find('img'); if (img.attr('src') != OC.imagePath('core', 'actions/public')) { |