extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-16 19:41:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not use full path of attachments in compose popup

Browse Source
This commit is contained in:
Ralf Becker
2014-10-20 18:08:03 +00:00
parent 10eb33cbdd
commit dec861fb3e
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mail/js/app.js
View File

@ -2363,7 +2363,6 @@ app.classes.mail = AppJS.extend(
case 'TEXT/CALENDAR':
case 'TEXT/X-VCALENDAR':
url += 'menuaction=mail.mail_compose.getAttachment'; // todo compose for Draft folder
url += '&filename='+attgrid.file;
url += '&tmpname='+attgrid.tmp_name;
url += '&name='+attgrid.name;
//url += '&size='+attgrid.size;
@ -2408,7 +2407,6 @@ app.classes.mail = AppJS.extend(
*/
default:
url += 'menuaction=mail.mail_compose.getAttachment'; // todo compose for Draft folder
url += '&filename='+attgrid.file;
url += '&tmpname='+attgrid.tmp_name;
url += '&name='+attgrid.name;
//url += '&size='+attgrid.size;
@ -2860,10 +2858,10 @@ app.classes.mail = AppJS.extend(
messages['all'] = _allMessagesChecked;
if (messages['all']=='cancel') return false;
if (messages['all']) messages['activeFilters'] = this.mail_getActiveFilters(_action);
// Make sure a default target folder is set in case of drop target is parent 0 (mail account name)
// Make sure a default target folder is set in case of drop target is parent 0 (mail account name)
if (!target.match(/::/g)) target += '::INBOX';
var self = this;
egw.json('mail.mail_ui.ajax_copyMessages',[target, messages, 'move'], function(){self.unlock_tree();})
.sendRequest();
@ -3636,15 +3634,15 @@ app.classes.mail = AppJS.extend(
widget:{},
jQClass: '.mailComposeJQueryFolder'
}};
for(var widget in widgets)
{
var expanderBtn = widget + '_expander';
widgets[widget].widget = this.et2.getWidgetById(widget);
// Add expander button widget to the widgets object
widgets[expanderBtn] = {widget:this.et2.getWidgetById(expanderBtn)};
if (typeof widgets[widget].widget != 'undefined'
if (typeof widgets[widget].widget != 'undefined'
&& typeof widgets[expanderBtn].widget != 'undefined'
&& widgets[widget].widget.get_value().length == 0)
{