1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 16:25:22 +03:00

Add paste from clipboard option to VTX tab (#1650)

Add paste from clipboard option to VTX tab
This commit is contained in:
Michael Keller 2019-09-15 00:43:30 +12:00 committed by GitHub
commit dde266a4de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 172 additions and 25 deletions

111
src/js/Clipboard.js Normal file
View file

@ -0,0 +1,111 @@
'use strict';
/**
* Encapsulates the Clipboard logic, depending on web or nw
*
*/
var Clipboard = {
_nwClipboard: null,
available : null,
readAvailable : null,
writeAvailable : null,
writeText : null,
readText : null
};
Clipboard._configureClipboardAsNwJs = function(nwGui) {
console.log('NW GUI Clipboard available');
this.available = true;
this.readAvailable = true;
this.writeAvailable = true;
this._nwClipboard = nwGui.Clipboard.get();
this.writeText = function(text, onSuccess, onError) {
try {
this._nwClipboard.set(text, "text");
} catch (err) {
if (onError) {
onError(err);
}
}
if (onSuccess) {
onSuccess(text);
}
}
this.readText = function(onSuccess, onError) {
let text = '';
try {
text = this._nwClipboard.get("text");
} catch (err) {
if (onError) {
onError(err);
}
}
if (onSuccess) {
onSuccess(text);
}
}
}
Clipboard._configureClipboardAsChrome = function() {
console.log('Chrome Clipboard available');
this.available = true;
this.readAvailable = false; // FIXME: for some reason the read is not working
this.writeAvailable = true;
this.writeText = function(text, onSuccess, onError) {
navigator.clipboard.writeText(text)
.then(onSuccess)
.catch(onError);
}
this.readText = function(onSuccess, onError) {
navigator.clipboard.readText()
.then(onSuccess)
.catch(onError);
}
}
Clipboard._configureClipboardAsOther = function() {
console.warn('NO Clipboard available');
this.available = false;
this.readAvailable = false;
this.writeAvailable = false;
this.writeText = function(text, onSuccess, onError) {
onError('Clipboard not available');
}
this.readText = function(onSuccess, onError) {
onError('Clipboard not available');
}
}
switch (GUI.Mode) {
case GUI_Modes.NWJS:
Clipboard._configureClipboardAsNwJs(GUI.nwGui);
break;
case GUI_Modes.ChromeApp:
Clipboard._configureClipboardAsChrome();
break;
default:
Clipboard._configureClipboardAsOther();
}

View file

@ -44,7 +44,7 @@ function getCliCommand(command, cliBuffer) {
return commandWithBackSpaces(command, buffer, noOfCharsToDelete);
}
function copyToClipboard(text, nwGui) {
function copyToClipboard(text) {
function onCopySuccessful() {
const button = $('.tab-cli .copy');
const origText = button.text();
@ -67,26 +67,10 @@ function copyToClipboard(text, nwGui) {
console.warn(ex);
}
function nwCopy(text) {
try {
let clipboard = nwGui.Clipboard.get();
clipboard.set(text, "text");
onCopySuccessful();
} catch (ex) {
onCopyFailed(ex);
}
}
function webCopy(text) {
navigator.clipboard.writeText(text)
.then(onCopySuccessful, onCopyFailed);
}
let copyFunc = nwGui ? nwCopy : webCopy;
copyFunc(text);
Clipboard.writeText(text, onCopySuccessful, onCopyFailed);
}
TABS.cli.initialize = function (callback, nwGui) {
TABS.cli.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'cli') {
@ -96,8 +80,6 @@ TABS.cli.initialize = function (callback, nwGui) {
self.outputHistory = "";
self.cliBuffer = "";
// nwGui variable is set in main.js
const clipboardCopySupport = !(nwGui == null && !navigator.clipboard);
const enterKeyCode = 13;
function executeCommands(out_string) {
@ -194,14 +176,14 @@ TABS.cli.initialize = function (callback, nwGui) {
$('.tab-cli .window .wrapper').empty();
});
if (clipboardCopySupport) {
if (Clipboard.available) {
$('.tab-cli .copy').click(function() {
copyToClipboard(self.outputHistory, nwGui);
copyToClipboard(self.outputHistory);
});
} else {
$('.tab-cli .copy').hide();
}
$('.tab-cli .load').click(function() {
var accepts = [
{

View file

@ -160,6 +160,9 @@ TABS.vtx.initialize = function (callback) {
$(".vtx_table_not_configured").toggle(vtxTableNotConfigured);
$(".vtx_table_save_pending").toggle(TABS.vtx.vtxTableSavePending);
// Buttons
$('.clipboard_available').toggle(Clipboard.available && Clipboard.readAvailable);
// Insert actual values in the fields
// Values of the selected mode
$("#vtx_frequency").val(VTX_CONFIG.vtx_frequency);
@ -484,6 +487,10 @@ TABS.vtx.initialize = function (callback) {
load_json();
});
$('a.load_clipboard').click(function () {
load_clipboard_json();
});
$('a.save').click(function () {
save_vtx();
});
@ -595,6 +602,36 @@ TABS.vtx.initialize = function (callback) {
});
}
function load_clipboard_json() {
try {
Clipboard.readText(
function(text) {
console.log('Pasted content: ', text);
let vtxConfig = JSON.parse(text);
read_vtx_config_json(vtxConfig, load_html);
TABS.vtx.vtxTableSavePending = true;
console.log('Load VTX clipboard end');
GUI.log(i18n.getMessage('vtxLoadClipboardOk'));
}, function(err) {
GUI.log(i18n.getMessage('vtxLoadClipboardKo'));
console.error('Failed to read clipboard contents: ', err);
}
);
} catch (err) {
console.error('Failed loading VTX file config: ' + err);
GUI.log(i18n.getMessage('vtxLoadClipboardKo'));
}
}
// Save all the values from the tab to MSP
function save_vtx() {