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

* Mail: Fix mail compose attachment is not shown while it's on upload progress for the first time

Browse Source
This commit is contained in:
Hadi Nategh 2014-09-04 11:44:02 +00:00
parent aca5c7948e
commit a7a5048414
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/js/app.js
View File

@ -3049,13 +3049,24 @@ app.classes.mail = AppJS.extend(
if (_file_count && !jQuery.isEmptyObject(_event.data.getValue()))
{
var widget = _event.data;
// var request = new egw_json_request('mail_ui::ajax_importMessage', ['upload', widget.getValue(), _path], this);
// widget.set_value('');
// request.sendRequest();//false, this._upload_callback, this);
this.et2_obj.submit();
}
},
/**
* Visible attachment box in compose dialog as soon as the file starts to upload
*/
composeUploadStart: function ()
{
var boxAttachment = this.et2.getWidgetById('mailUploadProgress');
if (boxAttachment)
{
var groupbox = boxAttachment.getParent();
if (groupbox) groupbox.set_disabled(false);
}
return true;
},
/**
* Upload for import (VFS)
*

2
mail/templates/default/compose.xet
View File

@ -14,7 +14,7 @@
</description>
<description class="email-button-group file">
<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mail-compose"/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
</description>
<description class="email-button-group egw">
<description class="$cont[noSaveAsAvailable]" value="Save:"/>