[Pkg-owncloud-commits] [owncloud] 209/223: Fixed file actions fallback

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 502573eb2ec6b8221a2e902e54ef0aeec26be8f0
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 20 12:58:04 2014 +0200

    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 de02bf5..5bd75ac 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()
 				});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git