holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filemanager open action regarding to the file mime type whether it needs to be opened in expose or in popup

Browse Source
This commit is contained in:
Hadi Nategh 2015-04-07 12:32:57 +00:00
parent bf187f131f
commit 9dff170c70
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filemanager/js/app.js
View File

@ -738,11 +738,19 @@ app.classes.filemanager = AppJS.extend(
{ {
var data = egw.dataGetUIDdata(_senders[0].id); var data = egw.dataGetUIDdata(_senders[0].id);
var path = this.id2path(_senders[0].id); var path = this.id2path(_senders[0].id);
var mime = this.et2._inst.widgetContainer.getWidgetById('$row');
// try to get mime widget DOM node out of the row DOM
var mime_dom = jQuery(_senders[0].iface.getDOMNode()).find("span#filemanager-index_\\$row");
// symlinks dont have mime 'http/unix-directory', but server marks all directories with class 'isDir' // symlinks dont have mime 'http/unix-directory', but server marks all directories with class 'isDir'
if (data.data.mime == 'httpd/unix-directory' || data.data['class'] && data.data['class'].split(/ +/).indexOf('isDir') != -1) if (data.data.mime == 'httpd/unix-directory' || data.data['class'] && data.data['class'].split(/ +/).indexOf('isDir') != -1)
{ {
this.change_dir(path,_action.parent.data.nextmatch || this.et2); this.change_dir(path,_action.parent.data.nextmatch || this.et2);
} }
else if(mime && data.data.mime.match(mime.mime_regexp) && mime_dom.length>0)
{
mime_dom.click();
}
else else
{ {
egw.open({path: path, type: data.data.mime}, 'file','view',null,'_browser'); egw.open({path: path, type: data.data.mime}, 'file','view',null,'_browser');