diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-08-21 22:19:38 +0200 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-08-21 22:19:38 +0200 |
| commit | 056ed00a4cea6175eb57781569a77648ce7d3382 (patch) | |
| tree | 5b5a4f3469bb8fb6b3d3368795ed60d8a6441682 /view/tpl/msg-header.tpl | |
| parent | a944a879b1e6ebd8b3d278b86ea4404ba5b7aa81 (diff) | |
| parent | d8ef1417fb2ff8d736e4392c118c51c63dc66b1d (diff) | |
| download | volse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.tar.gz volse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.tar.bz2 volse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.zip | |
Merge remote-tracking branch 'upstream/master'
Update
Diffstat (limited to 'view/tpl/msg-header.tpl')
| -rwxr-xr-x | view/tpl/msg-header.tpl | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 0be288709..5e2597605 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -54,7 +54,19 @@ else name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); + addeditortext(response); + $('#profile-rotator').spin(false); + } + } + ); + + var file_uploader = new window.AjaxUpload( + 'prvmail-attach', + { action: 'wall_attach/{{$nickname}}', + name: 'userfile', + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); $('#profile-rotator').spin(false); } } @@ -67,7 +79,7 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } @@ -86,11 +98,22 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } } + function addeditortext(data) { + if(plaintext == 'none') { + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); + } + else + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + + + </script> |