Skip to content

Commit

Permalink
Fixed issue #14858: Upload status is not visible enough (#1272)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shnoulle committed May 8, 2019
1 parent 62fa3a0 commit ffee4e1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion application/controllers/UploaderController.php
Expand Up @@ -325,7 +325,7 @@ function run($actionID)
</div>
<p class="alert alert-info uploadmsg">'.sprintf(gT("You can upload %s under %s KB each."), $qidattributes['allowed_filetypes'], $qidattributes['max_filesize']).'</p>
<div class="uploadstatus" id="uploadstatus"></div>
<div id="uploadstatus" class="uploadstatus alert alert-warning hidden"></div>
<!-- The list of uploaded files -->
</div>
Expand Down
6 changes: 3 additions & 3 deletions assets/scripts/uploader.js
Expand Up @@ -219,11 +219,11 @@ function doFileUpload()
$('#' + fieldname + '_filecount').val(filecount);

if (filecount < minfiles) {
$('#uploadstatus').html(uploadLang.errorNeedMore.replace('%s', (minfiles - filecount)));
$('#uploadstatus').html(uploadLang.errorNeedMore.replace('%s', (minfiles - filecount))).removeClass('hidden');
} else if (filecount < maxfiles) {
$('#uploadstatus').html(uploadLang.errorMoreAllowed.replace('%s', (maxfiles - filecount)));
$('#uploadstatus').html(uploadLang.errorMoreAllowed.replace('%s', (maxfiles - filecount))).removeClass('hidden');
} else {
$('#uploadstatus').html(uploadLang.errorMaxReached);
$('#uploadstatus').html(uploadLang.errorMaxReached).removeClass('hidden');
}
fixParentHeigth(fieldname);
if (filecount >= maxfiles) {
Expand Down

5 comments on commit ffee4e1

@Shnoulle
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olleharstedt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, causing merge conflict. Please merge (not today ;) ).

@Shnoulle
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@olleharstedt
Copy link
Contributor

@olleharstedt olleharstedt commented on ffee4e1 May 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now you made your wife mad. :(

@Shnoulle
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shush! … she don't see it (and it take me a very light time)

Please sign in to comment.