diff options
author | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
commit | b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f (patch) | |
tree | d09bc96d4f78df033b76513242bbb80ff57240bd /view/tpl/jot-header.tpl | |
parent | e5a3179468c84ab78ffa655353bc068508e8cdfd (diff) | |
parent | da9b6690e565452a9a9d69084a07ac48005d7e60 (diff) | |
download | volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.gz volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.bz2 volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ee00e25e6..c0d524764 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -511,10 +511,10 @@ function enableOnUser(){ xhr.addEventListener('load', function (e) { //console.log('xhr upload complete', e); window.fileUploadsCompleted = window.fileUploadsCompleted + 1; + 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) { - addeditortext(xhr.responseText); - $('#jot-media').val($('#jot-media').val() + xhr.responseText); + if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { $('#profile-rotator').spin(false); window.fileUploadsCompleted = window.filesToUpload = 0; } |