diff options
author | zottel <github@zottel.net> | 2016-08-12 20:43:05 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2016-08-12 20:43:05 +0200 |
commit | e4bdc92834be9f308ef0f6a253c81f90d1e7537b (patch) | |
tree | e38f2f59ab212ea9403770427b8e4c36aa4aca96 /view/tpl/jot-header.tpl | |
parent | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (diff) | |
parent | ebbe18a426e6959b6bd8bdf23f36902b1a21db1f (diff) | |
download | volse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.tar.gz volse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.tar.bz2 volse-hubzilla-e4bdc92834be9f308ef0f6a253c81f90d1e7537b.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view/tpl/jot-header.tpl')
-rwxr-xr-x | view/tpl/jot-header.tpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 9de049b58..fc87c14d7 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -503,6 +503,7 @@ function enableOnUser(){ // cancel event and hover styling DragDropUploadFileHover(e); + if (!editor) $("#profile-jot-text").val(""); // fetch FileList object @@ -527,7 +528,11 @@ function enableOnUser(){ xhr.addEventListener('load', function (e) { //console.log('xhr upload complete', e); window.fileUploadsCompleted = window.fileUploadsCompleted + 1; - addeditortext(xhr.responseText); + + initEditor(function() { + addeditortext(xhr.responseText); + }); + $('#jot-media').val($('#jot-media').val() + xhr.responseText); // When all the uploads have completed, refresh the page if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { |