diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
| commit | f2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch) | |
| tree | b1424be17877cbd25bf3781600d353efd3dd0759 /apps/files_sharing/js | |
| parent | 7e4dcd268f6cb6618600718a51c4d882e9027829 (diff) | |
| parent | 9be836814cb4165ea54a086a0f97526d783bcd37 (diff) | |
| download | nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip | |
Merge master into oc_preview
Diffstat (limited to 'apps/files_sharing/js')
| -rw-r--r-- | apps/files_sharing/js/share.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index eb5a6e8cb7f..3be89a39fa0 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -4,6 +4,10 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) { + $('#fileList').one('fileActionsReady',function(){ + OC.Share.loadIcons('file'); + }); + FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { var item = $('#dir').val() + filename; @@ -33,6 +37,5 @@ $(document).ready(function() { OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions); } }); - OC.Share.loadIcons('file'); } }); |