extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix filemanager document editor does not respect page size format

Browse Source
This commit is contained in:
Hadi Nategh 2016-07-25 18:29:19 +02:00
parent ecbb81819a
commit 693bf4d0a8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/expose.js
View File

@ -629,7 +629,7 @@ function expose (widget)
egw.open_link(egw.link('/index.php', { egw.open_link(egw.link('/index.php', {
menuaction: 'filemanager.filemanager_ui.editor', menuaction: 'filemanager.filemanager_ui.editor',
path: _value.download_url path: _value.download_url
}), '', '800x600'); }), '', egw.link_get_registry('filemanager','view_popup'));
} }
}); });
} }

1
filemanager/inc/class.filemanager_hooks.inc.php
View File

@ -256,6 +256,7 @@ class filemanager_hooks
'merge' => true, 'merge' => true,
'entry' => 'File', 'entry' => 'File',
'entries' => 'Files', 'entries' => 'Files',
'view_popup' => '850x750',
); );
} }
} }

7
filemanager/js/app.js
View File

@ -789,7 +789,7 @@ app.classes.filemanager = AppJS.extend(
egw.open_link(egw.link('/index.php', { egw.open_link(egw.link('/index.php', {
menuaction: 'filemanager.filemanager_ui.editor', menuaction: 'filemanager.filemanager_ui.editor',
path: data.data.download_url path: data.data.download_url
}), '', '800x600'); }), '', egw.link_get_registry('filemanager','view_popup'));
} }
else else
{ {
@ -1139,9 +1139,8 @@ app.classes.filemanager = AppJS.extend(
{ {
egw.open_link(egw.link('/index.php', { egw.open_link(egw.link('/index.php', {
menuaction: 'filemanager.filemanager_ui.editor', menuaction: 'filemanager.filemanager_ui.editor',
path: template_url, path: template_url
isNew: true }), '', egw.link_get_registry('filemanager','view_popup'));
}), '', '800x600');
} }
}, },