joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into release-1.0

Browse Source
This commit is contained in:
Jakob Ketterl
2021-05-07 17:53:51 +02:00
parent e205953bfc 1b31c5fc90
commit 3daf005c81
4 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/lib/settings/ImageUpload.js
View File

@ -20,18 +20,22 @@ $.fn.imageUpload = function() {
$this.removeClass('is-invalid');
};
$uploadButton.click(function(){
$uploadButton.prop('disabled', true);
var input = document.createElement('input');
input.type = 'file';
input.accept = 'image/jpeg, image/png';
input.accept = 'image/jpeg, image/png, image/webp';
input.onchange = function(e) {
$uploadButton.prop('disabled', true);
var $spinner = $('<span class="spinner-border spinner-border-sm mr-1" role="status"></span>');
$uploadButton.prepend($spinner);
var reader = new FileReader()
reader.readAsArrayBuffer(e.target.files[0]);
reader.onprogress = function(e) {
if (e.loaded > maxSize) {
handleError('Maximum file size exceeded');
$uploadButton.prop('disabled', false);
$spinner.remove();
reader.abort();
}
};
@ -39,6 +43,7 @@ $.fn.imageUpload = function() {
if (e.loaded > maxSize) {
handleError('Maximum file size exceeded');
$uploadButton.prop('disabled', false);
$spinner.remove();
return;
}
$.ajax({
@ -49,6 +54,10 @@ $.fn.imageUpload = function() {
contentType: 'application/octet-stream',
}).done(function(data){
$input.val(data.file);
$img.one('load', function() {
$uploadButton.prop('disabled', false);
$spinner.remove();
});
$img.prop('src', '../imageupload?file=' + data.file);
clearError();
}).fail(function(xhr, error){
@ -58,8 +67,8 @@ $.fn.imageUpload = function() {
} catch (e) {
handleError(error);
}
}).always(function(){
$uploadButton.prop('disabled', false);
$spinner.remove();
});
}
};