diff options
| author | git-marijus <mario@mariovavti.com> | 2017-08-03 15:30:40 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-03 15:30:40 +0200 |
| commit | 7b177be271c5ac2a87a5aadd36233bbe693800e0 (patch) | |
| tree | d993da91ba3999fff0998f8262841bc8a83fb727 /view | |
| parent | dc7c3f70ebff3220fa4586a36034476f56ea6481 (diff) | |
| download | volse-hubzilla-7b177be271c5ac2a87a5aadd36233bbe693800e0.tar.gz volse-hubzilla-7b177be271c5ac2a87a5aadd36233bbe693800e0.tar.bz2 volse-hubzilla-7b177be271c5ac2a87a5aadd36233bbe693800e0.zip | |
fix attachment upload for private mail
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/msg-header.tpl | 53 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 1 |
2 files changed, 26 insertions, 28 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 013e1cfdc..0e8fb0389 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,34 +1,31 @@ -<script type="text/javascript" src="view/js/ajaxupload.js" ></script> -<script language="javascript" type="text/javascript"> - - $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); - - +<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script> +<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script> +<script src="library/blueimp_upload/js/jquery.fileupload.js"></script> +<script> $(document).ready(function() { - var file_uploader = new window.AjaxUpload( - 'prvmail-attach-wrapper', - { action: 'wall_attach/{{$nickname}}', - name: 'userfile', - onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, - onComplete: function(file,response) { - addmailtext(response); - $('#prvmail-rotator').spin(false); - } - } - ); + $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); + + $('#invisible-wall-file-upload').fileupload({ + url: 'wall_attach/{{$nickname}}', + dataType: 'json', + dropZone: $('#prvmail-text'), + maxChunkSize: 4 * 1024 * 1024, + add: function(e,data) { + $('#prvmail-rotator').spin('tiny'); + data.submit(); + }, + done: function(e,data) { + addmailtext(data.result.message); + $('#jot-media').val($('#jot-media').val() + data.result.message); + }, + stop: function(e,data) { + $('#prvmail-rotator').spin(false); + }, + }); - var file_uploader_sub = new window.AjaxUpload( - 'prvmail-attach-sub', - { action: 'wall_attach/{{$nickname}}', - name: 'userfile', - onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, - onComplete: function(file,response) { - addmailtext(response); - $('#prvmail-rotator').spin(false); - } - } - ); + $('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); + $('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); }); diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 925447ff2..af6315c7e 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -6,6 +6,7 @@ <div class="section-content-wrapper"> {{/if}} <div id="prvmail-wrapper" > + <input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple> <form id="prvmail-form" action="mail" method="post" > <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> <input type="hidden" name="media_str" id="jot-media" value="" /> |