diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-08-24 17:05:18 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-08-24 17:05:18 +0100 |
| commit | c803fb90df3bbbd8bb88df09a271b5a9214e8c1d (patch) | |
| tree | 0ad021580411798fc0ab025f1b1c302fe8afd3f6 /view/tpl/msg-header.tpl | |
| parent | 6999fb586ba90e9f1c79e9f09f4035f63fb925fd (diff) | |
| parent | b0dd38b30949f907265eda757bfa14aa1f38b38f (diff) | |
| download | volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.tar.gz volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.tar.bz2 volse-hubzilla-c803fb90df3bbbd8bb88df09a271b5a9214e8c1d.zip | |
Merge remote-tracking branch 'upstream/master'
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> |