From db5cac3b3fa64af74353ae121e75d2182a211327 Mon Sep 17 00:00:00 2001
From: ente <ente@baer.rwth-aachen.de>
Date: Sun, 5 Dec 2010 17:45:17 +0100
Subject: [PATCH] reverted a576150b Seems we don't really need this, since
calling e.g. fileActions['audio/x-wav'] is no problem. It should be also more
clear to use and read than e.g. fileActions.audioxwav
---
js/lib_files.js | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/js/lib_files.js b/js/lib_files.js
index 177d8a51c0..8f7f903558 100644
--- a/js/lib_files.js
+++ b/js/lib_files.js
@@ -355,13 +355,10 @@ OC_FILES.file=function(dir,file,type,mime){
}
}
}
- // replaced fileActions[this.mime] by fileActions[this.mime1 + this.mime2]
- // since an object name cannot contain slashes.
- // (correct me if I'm wrong)
- if(OC_FILES.fileActions[this.mime1 + this.mime2]){
- for(index in OC_FILES.fileActions[this.mime1 + this.mime2]){
- if(OC_FILES.fileActions[this.mime1 + this.mime2][index].call){
- this.actions[index]=OC_FILES.fileActions[this.mime1 + this.mime2][index];
+ if(OC_FILES.fileActions[this.mime]){
+ for(index in OC_FILES.fileActions[this.mime]){
+ if(OC_FILES.fileActions[this.mime][index].call){
+ this.actions[index]=OC_FILES.fileActions[this.mime][index];
}
}
}
--
GitLab