diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
| commit | edd92e4c09151238a89816186914f9382293ab9b (patch) | |
| tree | e25d87cecf45ff2c2189198e5369f7754e01873a /apps/files_sharing/js | |
| parent | 1348330c7d75d2b60d845a43be57dedc6199ea1a (diff) | |
| parent | 12f4494de02457d51004ca6a82c1b2160189819f (diff) | |
| download | nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip | |
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'apps/files_sharing/js')
| -rw-r--r-- | apps/files_sharing/js/share.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index eb5a6e8cb7f..b2efafde4e7 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'); } -}); +});
\ No newline at end of file |