diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-06-21 11:28:11 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-21 11:28:11 +0200 |
commit | 436d0223161bca7a86b7a37b2d137e90c1c54f68 (patch) | |
tree | 3a6781bae95e82c5b548c43164efee7b09900650 /apps | |
parent | da0e4b0af041ecdcf7db5d3795ccccd9025bccef (diff) | |
parent | 502573eb2ec6b8221a2e902e54ef0aeec26be8f0 (diff) | |
download | nextcloud-server-436d0223161bca7a86b7a37b2d137e90c1c54f68.tar.gz nextcloud-server-436d0223161bca7a86b7a37b2d137e90c1c54f68.zip |
Merge pull request #9120 from owncloud/fileactions-filelistfallback
Fixed file actions fallback
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/js/fileactions.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index de02bf5e730..5bd75ac6287 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -133,6 +133,8 @@ display: function (parent, triggerEvent, fileList) { if (!fileList) { console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance'); + // using default list instead, which could be wrong + fileList = OCA.Files.App.fileList; } this.currentFile = parent; var self = this; @@ -162,7 +164,7 @@ event.data.actionFunc(file, { $file: $tr, - fileList: fileList || OCA.Files.App.fileList, + fileList: fileList, fileActions: self, dir: $tr.attr('data-path') || fileList.getCurrentDirectory() }); |