extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Filemanager: fix broken expose view for filename click&open action

Browse Source
This commit is contained in:
hadi 2023-04-06 17:45:54 +02:00
parent a09c0bad38
commit 9a1593b154
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Expose/ExposeMixin.ts
View File

@ -27,7 +27,7 @@ const IMAGE_DEFAULT = {
}; };
// For filtering to only show things we can handle // For filtering to only show things we can handle
const MIME_REGEX = (navigator.userAgent.match(/(MSIE|Trident)/)) ? export const MIME_REGEX = (navigator.userAgent.match(/(MSIE|Trident)/)) ?
// IE only supports video/mp4 mime type // IE only supports video/mp4 mime type
new RegExp(/(video\/mp4)|(image\/:*(?!tif|x-xcf|pdf))|(audio\/:*)/, 'i') : new RegExp(/(video\/mp4)|(image\/:*(?!tif|x-xcf|pdf))|(audio\/:*)/, 'i') :
new RegExp(/(video\/(mp4|ogg|webm))|(image\/:*(?!tif|x-xcf|pdf))|(audio\/:*)/, 'i'); new RegExp(/(video\/(mp4|ogg|webm))|(image\/:*(?!tif|x-xcf|pdf))|(audio\/:*)/, 'i');

5
filemanager/js/filemanager.ts
View File

@ -20,6 +20,7 @@ import {et2_nextmatch_controller} from "../../api/js/etemplate/et2_extension_nex
import {egw} from "../../api/js/jsapi/egw_global"; import {egw} from "../../api/js/jsapi/egw_global";
import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox"; import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox";
import {et2_textbox} from "../../api/js/etemplate/et2_widget_textbox"; import {et2_textbox} from "../../api/js/etemplate/et2_widget_textbox";
import {ExposeMixin, MIME_REGEX} from "../../api/js/etemplate/Expose/ExposeMixin";
/** /**
* UI for filemanager * UI for filemanager
@ -988,7 +989,7 @@ export class filemanagerAPP extends EgwApp
this.et2 = this.et2 ? this.et2 : etemplate2.getById('filemanager-index').widgetContainer; this.et2 = this.et2 ? this.et2 : etemplate2.getById('filemanager-index').widgetContainer;
let mime = this.et2._inst.widgetContainer.getWidgetById('$row'); let mime = this.et2._inst.widgetContainer.getWidgetById('$row');
// try to get mime widget DOM node out of the row DOM // try to get mime widget DOM node out of the row DOM
let mime_dom = jQuery(_senders[0].iface.getDOMNode()).find("span#filemanager-index_\\$row"); let mime_dom = jQuery(_senders[0].iface.getDOMNode()).find("et2-vfs-mime");
let fe = egw.file_editor_prefered_mimes(); let fe = egw.file_editor_prefered_mimes();
// 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'
@ -996,7 +997,7 @@ export class filemanagerAPP extends EgwApp
{ {
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) else if(data.data.mime.match(MIME_REGEX) && mime_dom.length>0)
{ {
mime_dom.click(); mime_dom.click();
} }