Skip to content

Remove css utils from global scope #2999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2022
Merged

Remove css utils from global scope #2999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/js/tabs/pid_tuning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { i18n } from "../localization";
import { colorTables, getColorForPercentage } from '../utils/css.js';

const pid_tuning = {
RATE_PROFILE_MASK: 128,
Expand Down Expand Up @@ -2962,7 +2963,7 @@ pid_tuning.updatePIDColors = function(clear = false) {
}

const change = (currentValue - mspValue) / 50;
element.css({ "background-color": cssUtil.getColorForPercentage(change, cssUtil.colorTables.pidSlider) });
element.css({ "background-color": getColorForPercentage(change, colorTables.pidSlider) });
};

FC.PID_NAMES.forEach(function(elementPid, indexPid) {
Expand Down
22 changes: 7 additions & 15 deletions src/js/utils/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
'use strict';

/*
This utility contains CSS helpers.
*/

const CSSUtil = function () {};

CSSUtil.prototype.colorTables = {
export const colorTables = {
redWhiteGreen: [
{ percentage: -1, color: { r: 0xff, g: 0x00, b: 0x00, a: 1.0 } },
{ percentage: 0, color: { r: 0xff, g: 0xff, b: 0xff, a: 1.0 } },
Expand All @@ -20,19 +16,19 @@ CSSUtil.prototype.colorTables = {
};

// Stack Overflow: https://stackoverflow.com/a/7128796/4107016
CSSUtil.prototype.getColorForPercentage = function(percentage, colorTable = null) {
colorTable = colorTable || cssUtil.colorTables.redWhiteGreen;
export function getColorForPercentage(percentage, colorTableOverride = null) {
colorTableOverride = colorTableOverride || colorTables.redWhiteGreen;

percentage = Math.min(1, Math.max(-1, percentage));

let index;
for (index = 1; index < colorTable.length - 1; index++) {
if (percentage < colorTable[index].percentage) {
for (index = 1; index < colorTableOverride.length - 1; index++) {
if (percentage < colorTableOverride[index].percentage) {
break;
}
}
const lower = colorTable[index - 1];
const upper = colorTable[index];
const lower = colorTableOverride[index - 1];
const upper = colorTableOverride[index];
const range = upper.percentage - lower.percentage;
const rangePercentage = (percentage - lower.percentage) / range;
const percentageLower = 1 - rangePercentage;
Expand All @@ -45,7 +41,3 @@ CSSUtil.prototype.getColorForPercentage = function(percentage, colorTable = null
};
return `rgba(${[color.r, color.g, color.b, color.a].join(",")})`;
};

const cssUtil = new CSSUtil();
window.cssUtil = cssUtil;
export default cssUtil;
2 changes: 0 additions & 2 deletions src/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
<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>
<!-- 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/VtxDeviceStatus/VtxDeviceStatusFactory.js"></script>
<script type="text/javascript" src="./js/utils/VtxDeviceStatus/VtxDeviceStatus.js"></script>
Expand Down