summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-15 14:08:01 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-15 14:08:01 -0700
commitbd1895bdf8dff07bf9dc9803ce991e39daa52acc (patch)
tree4418b1f79395a95a020cb2c24cd2373710f18af4 /apps/files
parentb3241402b922876bfbc71851985b7331bcea87c9 (diff)
parentff67f115d403d13dedf77457c539963f50a80eec (diff)
downloadnextcloud-server-bd1895bdf8dff07bf9dc9803ce991e39daa52acc.tar.gz
nextcloud-server-bd1895bdf8dff07bf9dc9803ce991e39daa52acc.zip
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/fileactions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index aa66a57a7b5..de67d13559e 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -65,7 +65,7 @@ var FileActions = {
FileActions.currentFile = parent;
var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var file = FileActions.getCurrentFile();
- if ($('tr').filterAttr('data-file', file).data('renaming')) {
+ if ($('tr[data-file="'+file+'"]').data('renaming')) {
return;
}
parent.children('a.name').append('<span class="fileactions" />');
@@ -164,10 +164,11 @@ $(document).ready(function () {
window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
});
}
-
$('#fileList tr').each(function () {
FileActions.display($(this).children('td.filename'));
});
+
+ $('#fileList').trigger(jQuery.Event("fileActionsReady"));
});