diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-30 14:04:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-30 14:04:30 -0700 |
| commit | da9b6690e565452a9a9d69084a07ac48005d7e60 (patch) | |
| tree | d09bc96d4f78df033b76513242bbb80ff57240bd /view/tpl/jot-header.tpl | |
| parent | 4ce8f965aab8cfb09fc9f102f771cf67a7ee84fa (diff) | |
| parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
| download | volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.tar.gz volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.tar.bz2 volse-hubzilla-da9b6690e565452a9a9d69084a07ac48005d7e60.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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; } |