Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-18 13:55:14 +03:00
Code Issues Wiki Activity

Clean Sonar issues from main.js

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2019-11-05 16:45:08 +01:00
parent e69c904730
commit 3252654aea
1 changed files with 127 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

254
src/js/main.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
var googleAnalytics = analytics; window.googleAnalytics = analytics;
var analytics = undefined; window.analytics = null;
$(document).ready(function () { $(document).ready(function () {
$.getJSON('version.json', function(data) { $.getJSON('version.json', function(data) {
@ -10,7 +10,7 @@ $(document).ready(function () {
// Version in the ChromeApp's manifest takes precedence. // Version in the ChromeApp's manifest takes precedence.
if(chrome.runtime && chrome.runtime.getManifest) { if(chrome.runtime && chrome.runtime.getManifest) {
var manifest = chrome.runtime.getManifest(); const manifest = chrome.runtime.getManifest();
CONFIGURATOR.version = manifest.version; CONFIGURATOR.version = manifest.version;
// manifest.json for ChromeApp can't have a version // manifest.json for ChromeApp can't have a version
// with a prerelease tag eg 10.0.0-RC4 // with a prerelease tag eg 10.0.0-RC4
@ -22,8 +22,8 @@ $(document).ready(function () {
i18n.init(function() { i18n.init(function() {
startProcess(); startProcess();
checkSetupAnalytics(function (analytics) { checkSetupAnalytics(function (analyticsService) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'SelectedLanguage', i18n.selectedLanguage); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'SelectedLanguage', i18n.selectedLanguage);
}); });
initializeSerialBackend(); initializeSerialBackend();
@ -45,29 +45,30 @@ function checkSetupAnalytics(callback) {
} else if (callback) { } else if (callback) {
callback(analytics); callback(analytics);
} }
}; }
function getBuildType() { function getBuildType() {
return GUI.Mode; return GUI.Mode;
} }
function setupAnalytics(result) { function setupAnalytics(result) {
var userId; let userId;
if (result.userId) { if (result.userId) {
userId = result.userId; userId = result.userId;
} else { } else {
var uid = new ShortUniqueId(); const uid = new ShortUniqueId();
userId = uid.randomUUID(13); userId = uid.randomUUID(13);
ConfigStorage.set({ 'userId': userId }); ConfigStorage.set({ 'userId': userId });
} }
var optOut = !!result.analyticsOptOut; const optOut = !!result.analyticsOptOut;
var checkForDebugVersions = !!result.checkForConfiguratorUnstableVersions; const checkForDebugVersions = !!result.checkForConfiguratorUnstableVersions;
var debugMode = typeof process === "object" && process.versions['nw-flavor'] === 'sdk'; const debugMode = typeof process === "object" && process.versions['nw-flavor'] === 'sdk';
analytics = new Analytics('UA-123002063-1', userId, 'Betaflight Configurator', CONFIGURATOR.version, CONFIGURATOR.gitChangesetId, GUI.operating_system, checkForDebugVersions, optOut, debugMode, getBuildType()); window.analytics = new Analytics('UA-123002063-1', userId, 'Betaflight Configurator', CONFIGURATOR.version, CONFIGURATOR.gitChangesetId, GUI.operating_system,
checkForDebugVersions, optOut, debugMode, getBuildType());
function logException(exception) { function logException(exception) {
analytics.sendException(exception.stack); analytics.sendException(exception.stack);
@ -80,11 +81,11 @@ function setupAnalytics(result) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'AppStart', { sessionControl: 'start' }); analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'AppStart', { sessionControl: 'start' });
function sendCloseEvent() { function sendCloseEvent() {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'AppClose', { sessionControl: 'end' }) analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'AppClose', { sessionControl: 'end' });
} }
if (GUI.isNWJS()) { if (GUI.isNWJS()) {
var win = GUI.nwGui.Window.get(); const win = GUI.nwGui.Window.get();
win.on('close', function () { win.on('close', function () {
sendCloseEvent(); sendCloseEvent();
@ -110,8 +111,8 @@ function startProcess() {
// translate to user-selected language // translate to user-selected language
i18n.localizePage(); i18n.localizePage();
// alternative - window.navigator.appVersion.match(/Chrome\/([0-9.]*)/)[1]; GUI.log(i18n.getMessage('infoVersions', {
GUI.log(i18n.getMessage('infoVersions', { operatingSystem: GUI.operating_system, operatingSystem: GUI.operating_system,
chromeVersion: window.navigator.appVersion.replace(/.*Chrome\/([0-9.]*).*/, "$1"), chromeVersion: window.navigator.appVersion.replace(/.*Chrome\/([0-9.]*).*/, "$1"),
configuratorVersion: CONFIGURATOR.version })); configuratorVersion: CONFIGURATOR.version }));
@ -119,21 +120,6 @@ function startProcess() {
updateStatusBarVersion(); updateStatusBarVersion();
updateTopBarVersion(); updateTopBarVersion();
// notification messages for various operating systems
switch (GUI.operating_system) {
case 'Windows':
break;
case 'MacOS':
// var main_chromium_version = window.navigator.appVersion.replace(/.*Chrome\/([0-9.]*).*/,"$1").split('.')[0];
break;
case 'ChromeOS':
break;
case 'Linux':
break;
case 'UNIX':
break;
}
if (!GUI.isOther() && GUI.operating_system !== 'ChromeOS') { if (!GUI.isOther() && GUI.operating_system !== 'ChromeOS') {
checkForConfiguratorUpdates(); checkForConfiguratorUpdates();
} }
@ -141,29 +127,29 @@ function startProcess() {
// log webgl capability // log webgl capability
// it would seem the webgl "enabling" through advanced settings will be ignored in the future // it would seem the webgl "enabling" through advanced settings will be ignored in the future
// and webgl will be supported if gpu supports it by default (canary 40.0.2175.0), keep an eye on this one // and webgl will be supported if gpu supports it by default (canary 40.0.2175.0), keep an eye on this one
var canvas = document.createElement('canvas'); document.createElement('canvas');
// log library versions in console to make version tracking easier // log library versions in console to make version tracking easier
console.log('Libraries: jQuery - ' + $.fn.jquery + ', d3 - ' + d3.version + ', three.js - ' + THREE.REVISION); console.log(`Libraries: jQuery - ${$.fn.jquery}, d3 - ${d3.version}, three.js - ${THREE.REVISION}`);
// Tabs // Tabs
$("#tabs ul.mode-connected li").click(function() { $("#tabs ul.mode-connected li").click(function() {
// store the first class of the current tab (omit things like ".active") // store the first class of the current tab (omit things like ".active")
ConfigStorage.set({ ConfigStorage.set(
lastTab: $(this).attr("class").split(' ')[0] {lastTab: $(this).attr("class").split(' ')[0]}
}); );
}); });
var ui_tabs = $('#tabs > ul'); const ui_tabs = $('#tabs > ul');
$('a', ui_tabs).click(function () { $('a', ui_tabs).click(function () {
if ($(this).parent().hasClass('active') == false && !GUI.tab_switch_in_progress) { // only initialize when the tab isn't already active if ($(this).parent().hasClass('active') === false && !GUI.tab_switch_in_progress) { // only initialize when the tab isn't already active
var self = this, const self = this;
tabClass = $(self).parent().prop('class'); const tabClass = $(self).parent().prop('class');
var tabRequiresConnection = $(self).parent().hasClass('mode-connected'); const tabRequiresConnection = $(self).parent().hasClass('mode-connected');
var tab = tabClass.substring(4); const tab = tabClass.substring(4);
var tabName = $(self).text(); const tabName = $(self).text();
if (tabRequiresConnection && !CONFIGURATOR.connectionValid) { if (tabRequiresConnection && !CONFIGURATOR.connectionValid) {
GUI.log(i18n.getMessage('tabSwitchConnectionRequired')); GUI.log(i18n.getMessage('tabSwitchConnectionRequired'));
@ -175,7 +161,7 @@ function startProcess() {
return; return;
} }
if (GUI.allowedTabs.indexOf(tab) < 0 && tabName == "Firmware Flasher") { if (GUI.allowedTabs.indexOf(tab) < 0 && tabName === "Firmware Flasher") {
if (GUI.connected_to || GUI.connecting_to) { if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click(); $('a.connect').click();
} else { } else {
@ -202,7 +188,7 @@ function startProcess() {
$(self).parent().addClass('active'); $(self).parent().addClass('active');
// detach listeners and remove element data // detach listeners and remove element data
var content = $('#content'); const content = $('#content');
content.empty(); content.empty();
// display loading screen // display loading screen
@ -212,8 +198,8 @@ function startProcess() {
GUI.tab_switch_in_progress = false; GUI.tab_switch_in_progress = false;
} }
checkSetupAnalytics(function (analytics) { checkSetupAnalytics(function (analyticsService) {
analytics.sendAppView(tab); analyticsService.sendAppView(tab);
}); });
switch (tab) { switch (tab) {
@ -298,7 +284,7 @@ function startProcess() {
break; break;
default: default:
console.log('Tab not found:' + tab); console.log(`Tab not found: ${tab}`);
} }
}); });
} }
@ -308,7 +294,7 @@ function startProcess() {
// options // options
$('a#options').click(function () { $('a#options').click(function () {
var el = $(this); const el = $(this);
if (!el.hasClass('active')) { if (!el.hasClass('active')) {
el.addClass('active'); el.addClass('active');
@ -324,7 +310,7 @@ function startProcess() {
} }
$('div.permanentExpertMode input').change(function () { $('div.permanentExpertMode input').change(function () {
var checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'permanentExpertMode': checked}); ConfigStorage.set({'permanentExpertMode': checked});
@ -335,7 +321,7 @@ function startProcess() {
ConfigStorage.get('rememberLastTab', function (result) { ConfigStorage.get('rememberLastTab', function (result) {
$('div.rememberLastTab input') $('div.rememberLastTab input')
.prop('checked', !!result.rememberLastTab) .prop('checked', !!result.rememberLastTab)
.change(function() { ConfigStorage.set({rememberLastTab: $(this).is(':checked')}) }) .change(function() { ConfigStorage.set({rememberLastTab: $(this).is(':checked')}); })
.change(); .change();
}); });
@ -346,7 +332,7 @@ function startProcess() {
} }
$('div.checkForConfiguratorUnstableVersions input').change(function () { $('div.checkForConfiguratorUnstableVersions input').change(function () {
var checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'checkForConfiguratorUnstableVersions': checked}); ConfigStorage.set({'checkForConfiguratorUnstableVersions': checked});
@ -363,19 +349,19 @@ function startProcess() {
} }
$('div.analyticsOptOut input').change(function () { $('div.analyticsOptOut input').change(function () {
var checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'analyticsOptOut': checked}); ConfigStorage.set({'analyticsOptOut': checked});
checkSetupAnalytics(function (analytics) { checkSetupAnalytics(function (analyticsService) {
if (checked) { if (checked) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'OptOut'); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptOut');
} }
analytics.setOptOut(checked); analyticsService.setOptOut(checked);
if (!checked) { if (!checked) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'OptIn'); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptIn');
} }
}); });
}).change(); }).change();
@ -384,7 +370,7 @@ function startProcess() {
$('div.cliAutoComplete input') $('div.cliAutoComplete input')
.prop('checked', CliAutoComplete.configEnabled) .prop('checked', CliAutoComplete.configEnabled)
.change(function () { .change(function () {
var checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'cliAutoComplete': checked}); ConfigStorage.set({'cliAutoComplete': checked});
CliAutoComplete.setEnabled(checked); CliAutoComplete.setEnabled(checked);
@ -393,14 +379,14 @@ function startProcess() {
$('#darkThemeSelect') $('#darkThemeSelect')
.val(DarkTheme.configEnabled) .val(DarkTheme.configEnabled)
.change(function () { .change(function () {
var value = parseInt($(this).val()); const value = parseInt($(this).val());
ConfigStorage.set({'darkTheme': value}); ConfigStorage.set({'darkTheme': value});
setDarkTheme(value); setDarkTheme(value);
}).change(); }).change();
function close_and_cleanup(e) { function close_and_cleanup(e) {
if (e.type == 'click' && !$.contains($('div#options-window')[0], e.target) || e.type == 'keyup' && e.keyCode == 27) { if (e.type === 'click' && !$.contains($('div#options-window')[0], e.target) || e.type === 'keyup' && e.keyCode === 27) {
$(document).unbind('click keyup', close_and_cleanup); $(document).unbind('click keyup', close_and_cleanup);
$('div#options-window').slideUp(250, function () { $('div#options-window').slideUp(250, function () {
@ -419,8 +405,8 @@ function startProcess() {
// listen to all input change events and adjust the value within limits if necessary // listen to all input change events and adjust the value within limits if necessary
$("#content").on('focus', 'input[type="number"]', function () { $("#content").on('focus', 'input[type="number"]', function () {
var element = $(this), const element = $(this);
val = element.val(); const val = element.val();
if (!isNaN(val)) { if (!isNaN(val)) {
element.data('previousValue', parseFloat(val)); element.data('previousValue', parseFloat(val));
@ -429,42 +415,38 @@ function startProcess() {
$("#content").on('keydown', 'input[type="number"]', function (e) { $("#content").on('keydown', 'input[type="number"]', function (e) {
// whitelist all that we need for numeric control // whitelist all that we need for numeric control
var whitelist = [ const whitelist = [
96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, // numpad and standard number keypad 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, // numpad and standard number keypad
109, 189, // minus on numpad and in standard keyboard 109, 189, // minus on numpad and in standard keyboard
8, 46, 9, // backspace, delete, tab 8, 46, 9, // backspace, delete, tab
190, 110, // decimal point 190, 110, // decimal point
37, 38, 39, 40, 13 // arrows and enter 37, 38, 39, 40, 13, // arrows and enter
]; ];
if (whitelist.indexOf(e.keyCode) == -1) { if (whitelist.indexOf(e.keyCode) === -1) {
e.preventDefault(); e.preventDefault();
} }
}); });
$("#content").on('change', 'input[type="number"]', function () { $("#content").on('change', 'input[type="number"]', function () {
var element = $(this), const element = $(this);
min = parseFloat(element.prop('min')), const min = parseFloat(element.prop('min'));
max = parseFloat(element.prop('max')), const max = parseFloat(element.prop('max'));
step = parseFloat(element.prop('step')), const step = parseFloat(element.prop('step'));
val = parseFloat(element.val()),
decimal_places; let val = parseFloat(element.val());
// only adjust minimal end if bound is set // only adjust minimal end if bound is set
if (element.prop('min')) { if (element.prop('min') && val < min) {
if (val < min) {
element.val(min); element.val(min);
val = min; val = min;
} }
}
// only adjust maximal end if bound is set // only adjust maximal end if bound is set
if (element.prop('max')) { if (element.prop('max') && val > max) {
if (val > max) {
element.val(max); element.val(max);
val = max; val = max;
} }
}
// if entered value is illegal use previous value instead // if entered value is illegal use previous value instead
if (isNaN(val)) { if (isNaN(val)) {
@ -473,30 +455,26 @@ function startProcess() {
} }
// if step is not set or step is int and value is float use previous value instead // if step is not set or step is int and value is float use previous value instead
if (isNaN(step) || step % 1 === 0) { if ((isNaN(step) || step % 1 === 0) && val % 1 !== 0) {
if (val % 1 !== 0) {
element.val(element.data('previousValue')); element.val(element.data('previousValue'));
val = element.data('previousValue'); val = element.data('previousValue');
} }
}
// if step is set and is float and value is int, convert to float, keep decimal places in float according to step *experimental* // if step is set and is float and value is int, convert to float, keep decimal places in float according to step *experimental*
if (!isNaN(step) && step % 1 !== 0) { if (!isNaN(step) && step % 1 !== 0) {
decimal_places = String(step).split('.')[1].length; const decimal_places = String(step).split('.')[1].length;
if (val % 1 === 0) { if (val % 1 === 0 || String(val).split('.')[1].length !== decimal_places) {
element.val(val.toFixed(decimal_places));
} else if (String(val).split('.')[1].length != decimal_places) {
element.val(val.toFixed(decimal_places)); element.val(val.toFixed(decimal_places));
} }
} }
}); });
$("#showlog").on('click', function () { $("#showlog").on('click', function () {
var state = $(this).data('state'); let state = $(this).data('state');
if (state) { if (state) {
$("#log").animate({height: 27}, 200, function () { $("#log").animate({height: 27}, 200, function () {
var command_log = $('div#log'); const command_log = $('div#log');
command_log.scrollTop($('div.wrapper', command_log).height()); command_log.scrollTop($('div.wrapper', command_log).height());
}); });
$("#log").removeClass('active'); $("#log").removeClass('active');
@ -532,9 +510,9 @@ function startProcess() {
} }
$('input[name="expertModeCheckbox"]').change(function () { $('input[name="expertModeCheckbox"]').change(function () {
var checked = $(this).is(':checked'); const checked = $(this).is(':checked');
checkSetupAnalytics(function (analytics) { checkSetupAnalytics(function (analyticsService) {
analytics.setDimension(analytics.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off'); analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off');
}); });
if (FEATURE_CONFIG && FEATURE_CONFIG.features !== 0) { if (FEATURE_CONFIG && FEATURE_CONFIG.features !== 0) {
@ -555,32 +533,34 @@ function startProcess() {
setDarkTheme(result.darkTheme); setDarkTheme(result.darkTheme);
} }
}); });
}; }
function setDarkTheme(enabled) { function setDarkTheme(enabled) {
DarkTheme.setConfig(enabled); DarkTheme.setConfig(enabled);
checkSetupAnalytics(function (analytics) { checkSetupAnalytics(function (analyticsService) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.APPLICATION, 'DarkTheme', enabled); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'DarkTheme', enabled);
}); });
} }
function checkForConfiguratorUpdates() { function checkForConfiguratorUpdates() {
var releaseChecker = new ReleaseChecker('configurator', 'https://api.github.com/repos/betaflight/betaflight-configurator/releases'); const releaseChecker = new ReleaseChecker('configurator', 'https://api.github.com/repos/betaflight/betaflight-configurator/releases');
releaseChecker.loadReleaseData(notifyOutdatedVersion); releaseChecker.loadReleaseData(notifyOutdatedVersion);
} }
function notifyOutdatedVersion(releaseData) { function notifyOutdatedVersion(releaseData) {
ConfigStorage.get('checkForConfiguratorUnstableVersions', function (result) { ConfigStorage.get('checkForConfiguratorUnstableVersions', function (result) {
var showUnstableReleases = false; let showUnstableReleases = false;
if (result.checkForConfiguratorUnstableVersions) { if (result.checkForConfiguratorUnstableVersions) {
showUnstableReleases = true; showUnstableReleases = true;
} }
var versions = releaseData.filter(function (version) { const versions = releaseData.filter(function (version) {
var semVerVersion = semver.parse(version.tag_name); const semVerVersion = semver.parse(version.tag_name);
if (semVerVersion && (showUnstableReleases || semVerVersion.prerelease.length === 0)) { if (semVerVersion && (showUnstableReleases || semVerVersion.prerelease.length === 0)) {
return version; return version;
} else {
return null;
} }
}).sort(function (v1, v2) { }).sort(function (v1, v2) {
try { try {
@ -593,7 +573,7 @@ function notifyOutdatedVersion(releaseData) {
if (versions.length > 0 && semver.lt(CONFIGURATOR.version, versions[0].tag_name)) { if (versions.length > 0 && semver.lt(CONFIGURATOR.version, versions[0].tag_name)) {
GUI.log(i18n.getMessage('configuratorUpdateNotice', [versions[0].tag_name, versions[0].html_url])); GUI.log(i18n.getMessage('configuratorUpdateNotice', [versions[0].tag_name, versions[0].html_url]));
var dialog = $('.dialogConfiguratorUpdate')[0]; const dialog = $('.dialogConfiguratorUpdate')[0];
$('.dialogConfiguratorUpdate-content').html(i18n.getMessage('configuratorUpdateNotice', [versions[0].tag_name, versions[0].html_url])); $('.dialogConfiguratorUpdate-content').html(i18n.getMessage('configuratorUpdateNotice', [versions[0].tag_name, versions[0].html_url]));
@ -617,35 +597,34 @@ function update_packet_error(caller) {
} }
function microtime() { function microtime() {
var now = new Date().getTime() / 1000; return new Date().getTime() / 1000;
return now;
} }
function millitime() { function millitime() {
var now = new Date().getTime(); return new Date().getTime();
return now;
} }
var DEGREE_TO_RADIAN_RATIO = Math.PI / 180; const DEGREE_TO_RADIAN_RATIO = Math.PI / 180;
function degToRad(degrees) { function degToRad(degrees) {
return degrees * DEGREE_TO_RADIAN_RATIO; return degrees * DEGREE_TO_RADIAN_RATIO;
} }
function bytesToSize(bytes) { function bytesToSize(bytes) {
let outputBytes;
if (bytes < 1024) { if (bytes < 1024) {
bytes = bytes + ' Bytes'; outputBytes = `${bytes} Bytes`;
} else if (bytes < 1048576) { } else if (bytes < 1048576) {
bytes = (bytes / 1024).toFixed(3) + ' KB'; outputBytes = `${(bytes / 1024).toFixed(3)} KB`;
} else if (bytes < 1073741824) { } else if (bytes < 1073741824) {
bytes = (bytes / 1048576).toFixed(3) + ' MB'; outputBytes = `${(bytes / 1048576).toFixed(3)} MB`;
} else { } else {
bytes = (bytes / 1073741824).toFixed(3) + ' GB'; outputBytes = `${(bytes / 1073741824).toFixed(3)} GB`;
} }
return bytes; return outputBytes;
} }
function isExpertModeEnabled() { function isExpertModeEnabled() {
@ -707,95 +686,94 @@ function updateTabList(features) {
} }
function zeroPad(value, width) { function zeroPad(value, width) {
value = "" + value;
while (value.length < width) { let valuePadded = String(value);
value = "0" + value;
while (valuePadded.length < width) {
valuePadded = `0${value}`;
} }
return value; return valuePadded;
} }
function generateFilename(prefix, suffix) { function generateFilename(prefix, suffix) {
var date = new Date(); const date = new Date();
var filename = prefix; let filename = prefix;
if (CONFIG) { if (CONFIG) {
if (CONFIG.flightControllerIdentifier) { if (CONFIG.flightControllerIdentifier) {
filename = CONFIG.flightControllerIdentifier + '_' + filename; filename = `${CONFIG.flightControllerIdentifier}_${filename}`;
} }
if(CONFIG.name && CONFIG.name.trim() !== '') { if(CONFIG.name && CONFIG.name.trim() !== '') {
filename = filename + '_' + CONFIG.name.trim().replace(' ', '_'); filename = `${filename}_${CONFIG.name.trim().replace(' ', '_')}`;
} }
} }
filename = filename + '_' + date.getFullYear() const yyyymmdd = `${date.getFullYear()}${zeroPad(date.getMonth() + 1, 2)}${zeroPad(date.getDate(), 2)}`;
+ zeroPad(date.getMonth() + 1, 2) const hhmmss = `${zeroPad(date.getHours(), 2)}${zeroPad(date.getMinutes(), 2)}${zeroPad(date.getSeconds(), 2)}`;
+ zeroPad(date.getDate(), 2) filename = `${filename}_${yyyymmdd}_${hhmmss}`;
+ '_' + zeroPad(date.getHours(), 2)
+ zeroPad(date.getMinutes(), 2)
+ zeroPad(date.getSeconds(), 2);
return filename + '.' + suffix; return `${filename}.${suffix}`;
} }
function getTargetVersion(hardwareId) { function getTargetVersion(hardwareId) {
var versionText = ''; let versionText = '';
if (hardwareId) { if (hardwareId) {
versionText += i18n.getMessage('versionLabelTarget') + ': ' + hardwareId; versionText = `${i18n.getMessage('versionLabelTarget')}: ${hardwareId}`;
} }
return versionText; return versionText;
} }
function getFirmwareVersion(firmwareVersion, firmwareId) { function getFirmwareVersion(firmwareVersion, firmwareId) {
var versionText = ''; let versionText = '';
if (firmwareVersion) { if (firmwareVersion) {
versionText += i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion; versionText = `${i18n.getMessage('versionLabelFirmware')}: ${firmwareId} ${firmwareVersion}`;
} }
return versionText; return versionText;
} }
function getConfiguratorVersion() { function getConfiguratorVersion() {
return i18n.getMessage('versionLabelConfigurator') + ': ' + CONFIGURATOR.version; return `${i18n.getMessage('versionLabelConfigurator')}: ${CONFIGURATOR.version}`;
} }
function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) { function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) {
var versionText = getConfiguratorVersion() + '<br />';
versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId) + '<br />'; const configuratorVersion = getConfiguratorVersion();
const firmwareVersionAndId = getFirmwareVersion(firmwareVersion, firmwareId);
const targetVersion = getTargetVersion(hardwareId);
versionText = versionText + getTargetVersion(hardwareId); const versionText = `${configuratorVersion}<br />${firmwareVersionAndId}<br />${targetVersion}`;
$('#logo .logo_text').html(versionText); $('#logo .logo_text').html(versionText);
} }
function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) { function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) {
var versionText = ''; let versionText = '';
versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId); versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId);
if (versionText !== '') { if (versionText !== '') {
versionText = versionText + ', '; versionText = `${versionText}, `;
} }
let targetVersion = getTargetVersion(hardwareId); const targetVersion = getTargetVersion(hardwareId);
versionText = versionText + targetVersion; versionText = versionText + targetVersion;
if (targetVersion !== '') { if (targetVersion !== '') {
versionText = versionText + ', '; versionText = `${versionText}, `;
} }
versionText = versionText + getConfiguratorVersion() + ' (' + CONFIGURATOR.gitChangesetId + ')'; versionText = `${versionText}${getConfiguratorVersion()} (${CONFIGURATOR.gitChangesetId})`;
$('#status-bar .version').text(versionText); $('#status-bar .version').text(versionText);
} }
function showErrorDialog(message) { function showErrorDialog(message) {
var dialog = $('.dialogError')[0]; const dialog = $('.dialogError')[0];
$('.dialogError-content').html(message); $('.dialogError-content').html(message);