Skip to content

Commit 45dd6c3

Browse files
committed
chore: move css and CommonUtils to modules
* move static class to utils/common.js * move css to modules
1 parent e8f5e4e commit 45dd6c3

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

src/components/EscDshotDirection/EscDshotDirectionComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class EscDshotDirectionComponent
117117
this._onStopWizardButtonClicked();
118118
});
119119

120-
const imgSrc = CommonUtils.GetMixerImageSrc(FC.MIXER_CONFIG.mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
120+
const imgSrc = getMixerImageSrc(FC.MIXER_CONFIG.mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
121121
this._domMixerImg.attr('src', imgSrc);
122122

123123
this._onLoadedCallback();

src/js/tabs/motors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ TABS.motors.initialize = function (callback) {
203203
}
204204

205205
function update_model(mixer) {
206-
const imgSrc = CommonUtils.GetMixerImageSrc(mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
206+
const imgSrc = getMixerImageSrc(mixer, FC.MIXER_CONFIG.reverseMotorDir, FC.CONFIG.apiVersion);
207207
$('.mixerPreview img').attr('src', imgSrc);
208208

209209
const motorOutputReorderConfig = new MotorOutputReorderConfig(100);

src/js/utils/CommonUtils.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/js/utils/common.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,21 @@ export function generateVirtualApiVersions() {
7474
firmwareVersionDropdown.appendChild(option);
7575
}
7676
}
77+
export function getMixerImageSrc(mixerIndex, reverseMotorDir, apiVersion)
78+
{
79+
let reverse = "";
80+
81+
if (semver.gte(apiVersion, API_VERSION_1_36)) {
82+
reverse = reverseMotorDir ? "_reversed" : "";
83+
}
84+
85+
return `./resources/motor_order/${mixerList[mixerIndex - 1].image}${reverse}.svg`;
86+
}
7787

7888
// TODO: these are temp binding while transition to module happens
7989
window.microtime = microtime;
8090
window.degToRad = degToRad;
8191
window.bytesToSize = bytesToSize;
8292
window.checkChromeRuntimeError = checkChromeRuntimeError;
8393
window.generateVirtualApiVersions = generateVirtualApiVersions;
84-
window.millitime = millitime;
94+
window.getMixerImageSrc = getMixerImageSrc;

src/js/utils/css.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ CSSUtil.prototype.getColorForPercentage = function(percentage, colorTable = null
4747
};
4848

4949
const cssUtil = new CSSUtil();
50+
window.cssUtil = cssUtil;
51+
export default cssUtil;

src/main.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
<script type="text/javascript" src="./js/libraries/jquery.ba-throttle-debounce.min.js"></script>
7373
<script type="text/javascript" src="./node_modules/inflection/inflection.min.js"></script>
7474
<script type="text/javascript" src="./js/libraries/analytics.js"></script>
75-
<script type="text/javascript" src="./js/utils/css.js"></script>
75+
<!-- TODO: remove when using modules fully -->
76+
<script type="module" src="./js/utils/css.js"></script>
7677
<script type="text/javascript" src="./js/utils/window_watchers.js"></script>
7778
<script type="text/javascript" src="./js/utils/CommonUtils.js"></script>
7879
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>

0 commit comments

Comments
 (0)