rudefox
/
burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve file upload feedback (#112) 

Display an alert on successful upload.
Change button text to "Upload and Save" when it's possible to upload.

Fixes #82.
pull/311/head
Peter Johnson 2019-02-18 02:21:37 -08:00 committed by GitHub
parent aa0a7d8666
commit e84e55cd72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deps/tools/configServer/src/resources/frcvision.js vendored
View File

@ -39,6 +39,14 @@ function displayStatus(message) {
$('#status-content').html('<div id="status" class="alert alert-warning alert-dismissable fade show" role="alert"><span>' + escapeHtml(message) + '</span><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
}
function displaySuccess(message) {
$('#status-content').html('<div id="status" class="alert alert-success alert-dismissable fade show" role="alert"><span>' + escapeHtml(message) + '</span><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
}
function dismissStatus() {
$('.alert').alert('close');
}
// Enable and disable buttons based on connection status
var connectedButtonIds = ['systemRestart', 'networkApproach', 'networkAddress', 'networkMask', 'networkGateway', 'networkDNS', 'visionUp', 'visionDown', 'visionTerm', 'visionKill', 'systemReadOnly', 'systemWritable', 'visionClient', 'visionTeam', 'visionDiscard', 'addConnectedCamera', 'addCamera', 'applicationType'];
var connectedButtonClasses = ['cameraName', 'cameraPath', 'cameraAlternatePaths', 'cameraPixelFormat', 'cameraWidth', 'cameraHeight', 'cameraFps', 'cameraBrightness', 'cameraWhiteBalance', 'cameraExposure', 'cameraProperties', 'streamWidth', 'streamHeight', 'streamFps', 'streamCompression', 'streamDefaultCompression', 'cameraRemove', 'cameraCopyConfig']
@ -196,6 +204,7 @@ function connect() {
case 'applicationSaveComplete':
$('#applicationSave').button('reset');
updateApplicationView();
displaySuccess('Application successfully uploaded! See the Vision Status tab for status and console output');
break;
case 'systemReadOnly':
displayReadOnly();
@ -694,8 +703,10 @@ var applicationFiles = [];
function updateApplicationView() {
if ($('#applicationType').val().startsWith("upload")) {
$('#applicationUpload').collapse('show');
$('#applicationSaveText').text('Upload and Save');
} else {
$('#applicationUpload').collapse('hide');
$('#applicationSaveText').text('Save');
}
$('#applicationFile').val(null);
applicationFiles = [];
@ -703,10 +714,12 @@ function updateApplicationView() {
$('#applicationType').change(function() {
updateApplicationView();
dismissStatus();
});
$('#applicationFile').change(function() {
applicationFiles = this.files;
dismissStatus();
});
$('#applicationSave').click(function() {

2
deps/tools/configServer/src/resources/index.html vendored
View File

@ -438,7 +438,7 @@
</div>
<button id="applicationSave" type="button" class="btn btn-primary" data-loading-text="<i class='spin' data-feather='loader'></i> Saving" disabled>
<span data-feather="save"></span>
Save
<span id="applicationSaveText">Save</span>
</button>
</form>
</div>