aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorente <ente@baer.rwth-aachen.de>2010-12-04 17:36:52 +0100
committerente <ente@baer.rwth-aachen.de>2010-12-04 17:36:52 +0100
commita576150b64921f0f3d9d7d6700d0f26836f32b12 (patch)
tree22b1161b159554abddc655b7cd61b9369a1ec917 /js
parent7710dc7325f15b4b8fd9488c31288ed5d6f79dac (diff)
downloadnextcloud-server-a576150b64921f0f3d9d7d6700d0f26836f32b12.tar.gz
nextcloud-server-a576150b64921f0f3d9d7d6700d0f26836f32b12.zip
replaced fileActions[this.mime] by fileActions[this.mime1 + this.mime2], since an object name cannot contain slashes. (correct me if I'm wrong)
Diffstat (limited to 'js')
-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];
}
}
}