Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 08:45:28 +03:00
Code Issues Wiki Activity

chore: move css and CommonUtils to modules

Browse source 
* move static class to utils/common.js
* move css to modules
This commit is contained in:
Tomas Chmelevskij 2021-02-14 22:30:13 +01:00
parent e8f5e4e68d
commit 45dd6c3e3a
6 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/EscDshotDirection/EscDshotDirectionComponent.js
View file

@ -117,7 +117,7 @@ class EscDshotDirectionComponent
this._onStopWizardButtonClicked(); this._onStopWizardButtonClicked();
}); });
const imgSrc = CommonUtils.GetMixerImageSrc(FC.MIXER_CONFIG.mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion); const imgSrc = getMixerImageSrc(FC.MIXER_CONFIG.mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
this._domMixerImg.attr('src', imgSrc); this._domMixerImg.attr('src', imgSrc);
this._onLoadedCallback(); this._onLoadedCallback();

2
src/js/tabs/motors.js
View file

@ -203,7 +203,7 @@ TABS.motors.initialize = function (callback) {
} }
function update_model(mixer) { function update_model(mixer) {
const imgSrc = CommonUtils.GetMixerImageSrc(mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion); const imgSrc = getMixerImageSrc(mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
$('.mixerPreview img').attr('src', imgSrc); $('.mixerPreview img').attr('src', imgSrc);
const motorOutputReorderConfig = new MotorOutputReorderConfig(100); const motorOutputReorderConfig = new MotorOutputReorderConfig(100);

15
src/js/utils/CommonUtils.js
View file

@ -1,15 +0,0 @@
'use strict';
class CommonUtils
{
static GetMixerImageSrc(mixerIndex, reverseMotorDir, apiVersion)
{
let reverse = "";
if (semver.gte(apiVersion, API_VERSION_1_36)) {
reverse = reverseMotorDir ? "_reversed" : "";
}
return `./resources/motor_order/${mixerList[mixerIndex - 1].image}${reverse}.svg`;
}
}

12
src/js/utils/common.js
View file

@ -74,6 +74,16 @@ export function generateVirtualApiVersions() {
firmwareVersionDropdown.appendChild(option); firmwareVersionDropdown.appendChild(option);
} }
} }
export function getMixerImageSrc(mixerIndex, reverseMotorDir, apiVersion)
{
let reverse = "";
if (semver.gte(apiVersion, API_VERSION_1_36)) {
reverse = reverseMotorDir ? "_reversed" : "";
}
return `./resources/motor_order/${mixerList[mixerIndex - 1].image}${reverse}.svg`;
}
// TODO: these are temp binding while transition to module happens // TODO: these are temp binding while transition to module happens
window.microtime = microtime; window.microtime = microtime;
@ -81,4 +91,4 @@ window.degToRad = degToRad;
window.bytesToSize = bytesToSize; window.bytesToSize = bytesToSize;
window.checkChromeRuntimeError = checkChromeRuntimeError; window.checkChromeRuntimeError = checkChromeRuntimeError;
window.generateVirtualApiVersions = generateVirtualApiVersions; window.generateVirtualApiVersions = generateVirtualApiVersions;
window.millitime = millitime; window.getMixerImageSrc = getMixerImageSrc;

2
src/js/utils/css.js
View file

@ -47,3 +47,5 @@ CSSUtil.prototype.getColorForPercentage = function(percentage, colorTable = null
}; };
const cssUtil = new CSSUtil(); const cssUtil = new CSSUtil();
window.cssUtil = cssUtil;
export default cssUtil;

3
src/main.html
View file

@ -72,7 +72,8 @@
<script type="text/javascript" src="./js/libraries/jquery.ba-throttle-debounce.min.js"></script> <script type="text/javascript" src="./js/libraries/jquery.ba-throttle-debounce.min.js"></script>
<script type="text/javascript" src="./node_modules/inflection/inflection.min.js"></script> <script type="text/javascript" src="./node_modules/inflection/inflection.min.js"></script>
<script type="text/javascript" src="./js/libraries/analytics.js"></script> <script type="text/javascript" src="./js/libraries/analytics.js"></script>
<script type="text/javascript" src="./js/utils/css.js"></script> <!-- TODO: remove when using modules fully -->
<script type="module" src="./js/utils/css.js"></script>
<script type="text/javascript" src="./js/utils/window_watchers.js"></script> <script type="text/javascript" src="./js/utils/window_watchers.js"></script>
<script type="text/javascript" src="./js/utils/CommonUtils.js"></script> <script type="text/javascript" src="./js/utils/CommonUtils.js"></script>
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script> <script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>