sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2416 from chmelevskij/chore/utils-modules 

chore: move css and CommonUtils to modules
10.8-maintenance
Michael Keller 2021-02-17 07:52:45 +13:00 committed by GitHub
parent 99e36744d2 45dd6c3e3a
commit d123e08180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 19 deletions
Show Stats 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();
});
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._onLoadedCallback();

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

@ -203,7 +203,7 @@ TABS.motors.initialize = function (callback) {
}
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);
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,10 +74,20 @@ export function generateVirtualApiVersions() {
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
window.degToRad = degToRad;
window.bytesToSize = bytesToSize;
window.checkChromeRuntimeError = checkChromeRuntimeError;
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();
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="./node_modules/inflection/inflection.min.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/CommonUtils.js"></script>
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>