mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
e2fd5199c3
|
@ -145,8 +145,10 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 col-xs-4">
|
<div class="col-md-4 col-xs-4">
|
||||||
<button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }}</button>
|
<button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }} <span id="uploadIcon"></span></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<p class="label label-default col-md-12" style="font-size: 120%!important; margin-top: 10px; margin-bottom: 10px;" id="uploadFile-info"></p>
|
<p class="label label-default col-md-12" style="font-size: 120%!important; margin-top: 10px; margin-bottom: 10px;" id="uploadFile-info"></p>
|
||||||
|
@ -214,11 +216,19 @@
|
||||||
$("#uploadFile").on('change',function(event){
|
$("#uploadFile").on('change',function(event){
|
||||||
|
|
||||||
if ($('#uploadFile').val().length == 0) {
|
if ($('#uploadFile').val().length == 0) {
|
||||||
$("#uploadButton").attr("disabled", true);
|
$("#uploadButton").attr("disabled", true);
|
||||||
|
$("#uploadIcon").html('');
|
||||||
} else {
|
} else {
|
||||||
$('#uploadButton').removeAttr('disabled');
|
$('#uploadButton').removeAttr('disabled');
|
||||||
|
|
||||||
|
$("#uploadButton").click(function(){
|
||||||
|
$("#uploadIcon").html('<i class="fas fa-spinner spin"></i>');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in a new issue