From 502573eb2ec6b8221a2e902e54ef0aeec26be8f0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 20 Jun 2014 12:58:04 +0200
Subject: [PATCH] Fixed file actions fallback
Some apps are calling FileActions.display() directly but omit the new
fileList argument.
This fix makes the fileList argument correctly fall back to the default
file list (the one from the "All files" section)
---
apps/files/js/fileactions.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index de02bf5e73..5bd75ac628 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()
});
--
GitLab