aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--js/lib_files.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/js/lib_files.js b/js/lib_files.js
index 8f7f9035585..177d8a51c06 100644
--- a/js/lib_files.js
+++ b/js/lib_files.js
@@ -355,10 +355,13 @@ OC_FILES.file=function(dir,file,type,mime){
}
}
}
- 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];
+ // 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];
}
}
}