sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
remotes/origin/stable
ente 2010-12-05 17:45:17 +07:00
parent 087a72f0ef
commit db5cac3b3f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/lib_files.js
Unescape Escape View File

@ -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];
}
}
}