diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-06-16 23:15:58 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-06-16 23:15:58 +0200 |
| commit | 07b72ca53459bcd150a21e2133a7d5936d92cbec (patch) | |
| tree | da12f5359b0ebe3709bde448ca59a78274e30cae /files/js | |
| parent | 300b8c06cfacbae7df4f7886851cea8c895111c5 (diff) | |
| download | nextcloud-server-07b72ca53459bcd150a21e2133a7d5936d92cbec.tar.gz nextcloud-server-07b72ca53459bcd150a21e2133a7d5936d92cbec.zip | |
make the system for default fileactions more flexible
Diffstat (limited to 'files/js')
| -rw-r--r-- | files/js/fileactions.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js index dec1d1cfb04..1bdbc4ac0bb 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -8,7 +8,7 @@ FileActions={ FileActions.actions[mime][name]=action; }, setDefault:function(mime,name){ - FileActions.defaults[mime]=FileActions.actions[mime][name]; + FileActions.defaults[mime]=name; }, get:function(mime,type){ var actions={}; @@ -35,15 +35,18 @@ FileActions={ if(mime){ var mimePart=mime.substr(0,mime.indexOf('/')); } + var name=false; if(mime && FileActions.defaults[mime]){ - return FileActions.defaults[mime]; + name=FileActions.defaults[mime]; }else if(mime && FileActions.defaults[mimePart]){ - return FileActions.defaults[mimePart]; + name=FileActions.defaults[mimePart]; }else if(type && FileActions.defaults[type]){ - return FileActions.defaults[type]; + name=FileActions.defaults[type]; }else{ - return FileActions.defaults.all; + name=FileActions.defaults.all; } + var actions=this.get(mime,type); + return actions[name]; }, display:function(parent){ $('#file_menu ul').empty(); |