Formatting code with Prettier
This commit is contained in:
parent
9b687f013d
commit
3a41d7c551
@ -56,13 +56,14 @@ onUiLoaded(async() => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Check if hotkey is valid
|
// Check if hotkey is valid
|
||||||
function isValidHotkey(value) {
|
function isValidHotkey(value) {
|
||||||
const specialKeys = ["Ctrl", "Alt", "Shift", "Disable"];
|
const specialKeys = ["Ctrl", "Alt", "Shift", "Disable"];
|
||||||
return (
|
return (
|
||||||
(typeof value === "string" && value.length === 1 && /[a-z]/i.test(value)) ||
|
(typeof value === "string" &&
|
||||||
specialKeys.includes(value)
|
value.length === 1 &&
|
||||||
|
/[a-z]/i.test(value)) ||
|
||||||
|
specialKeys.includes(value)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,59 +84,67 @@ onUiLoaded(async() => {
|
|||||||
|
|
||||||
// Iterate through defaultHotkeysConfig keys
|
// Iterate through defaultHotkeysConfig keys
|
||||||
for (const key in defaultHotkeysConfig) {
|
for (const key in defaultHotkeysConfig) {
|
||||||
const userValue = hotkeysConfigOpts[key]; // User-provided hotkey value
|
const userValue = hotkeysConfigOpts[key]; // User-provided hotkey value
|
||||||
const defaultValue = defaultHotkeysConfig[key]; // Default hotkey value
|
const defaultValue = defaultHotkeysConfig[key]; // Default hotkey value
|
||||||
|
|
||||||
// Apply appropriate value for undefined, boolean, or object userValue
|
// Apply appropriate value for undefined, boolean, or object userValue
|
||||||
if (
|
if (
|
||||||
userValue === undefined ||
|
userValue === undefined ||
|
||||||
typeof userValue === "boolean" ||
|
typeof userValue === "boolean" ||
|
||||||
typeof userValue === "object" ||
|
typeof userValue === "object" ||
|
||||||
userValue === "disable"
|
userValue === "disable"
|
||||||
) {
|
) {
|
||||||
result[key] = userValue === undefined ? defaultValue : userValue;
|
result[key] =
|
||||||
} else if (isValidHotkey(userValue)) {
|
userValue === undefined ? defaultValue : userValue;
|
||||||
const normalizedUserValue = normalizeHotkey(userValue);
|
} else if (isValidHotkey(userValue)) {
|
||||||
|
const normalizedUserValue = normalizeHotkey(userValue);
|
||||||
|
|
||||||
// Check for conflicting hotkeys
|
// Check for conflicting hotkeys
|
||||||
if (!usedKeys.has(normalizedUserValue)) {
|
if (!usedKeys.has(normalizedUserValue)) {
|
||||||
usedKeys.add(normalizedUserValue);
|
usedKeys.add(normalizedUserValue);
|
||||||
result[key] = normalizedUserValue;
|
result[key] = normalizedUserValue;
|
||||||
|
} else {
|
||||||
|
console.error(
|
||||||
|
`Hotkey: ${formatHotkeyForDisplay(
|
||||||
|
userValue
|
||||||
|
)} for ${key} is repeated and conflicts with another hotkey. The default hotkey is used: ${formatHotkeyForDisplay(
|
||||||
|
defaultValue
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
result[key] = defaultValue;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
console.error(
|
console.error(
|
||||||
`Hotkey: ${formatHotkeyForDisplay(
|
`Hotkey: ${formatHotkeyForDisplay(
|
||||||
userValue
|
userValue
|
||||||
)} for ${key} is repeated and conflicts with another hotkey. The default hotkey is used: ${formatHotkeyForDisplay(
|
)} for ${key} is not valid. The default hotkey is used: ${formatHotkeyForDisplay(
|
||||||
defaultValue
|
defaultValue
|
||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
result[key] = defaultValue;
|
result[key] = defaultValue;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
console.error(
|
|
||||||
`Hotkey: ${formatHotkeyForDisplay(
|
|
||||||
userValue
|
|
||||||
)} for ${key} is not valid. The default hotkey is used: ${formatHotkeyForDisplay(
|
|
||||||
defaultValue
|
|
||||||
)}`
|
|
||||||
);
|
|
||||||
result[key] = defaultValue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disables functions in the config object based on the provided list of function names
|
||||||
function disableFunctions(config, disabledFunctions) {
|
function disableFunctions(config, disabledFunctions) {
|
||||||
disabledFunctions.forEach((funcName) => {
|
// Bind the hasOwnProperty method to the functionMap object to avoid errors
|
||||||
if (functionMap.hasOwnProperty(funcName)) {
|
const hasOwnProperty =
|
||||||
const key = functionMap[funcName];
|
Object.prototype.hasOwnProperty.bind(functionMap);
|
||||||
config[key] = "disable";
|
|
||||||
}
|
// Loop through the disabledFunctions array and disable the corresponding functions in the config object
|
||||||
|
disabledFunctions.forEach(funcName => {
|
||||||
|
if (hasOwnProperty(funcName)) {
|
||||||
|
const key = functionMap[funcName];
|
||||||
|
config[key] = "disable";
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Return the updated config object
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The restoreImgRedMask function displays a red mask around an image to indicate the aspect ratio.
|
* The restoreImgRedMask function displays a red mask around an image to indicate the aspect ratio.
|
||||||
@ -190,7 +199,7 @@ onUiLoaded(async() => {
|
|||||||
canvas_hotkey_fullscreen: "KeyS",
|
canvas_hotkey_fullscreen: "KeyS",
|
||||||
canvas_hotkey_move: "KeyF",
|
canvas_hotkey_move: "KeyF",
|
||||||
canvas_hotkey_overlap: "KeyO",
|
canvas_hotkey_overlap: "KeyO",
|
||||||
canvas_disabled_functions : [],
|
canvas_disabled_functions: [],
|
||||||
canvas_show_tooltip: true
|
canvas_show_tooltip: true
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -200,8 +209,8 @@ onUiLoaded(async() => {
|
|||||||
"Moving canvas": "canvas_hotkey_move",
|
"Moving canvas": "canvas_hotkey_move",
|
||||||
"Fullscreen": "canvas_hotkey_fullscreen",
|
"Fullscreen": "canvas_hotkey_fullscreen",
|
||||||
"Reset Zoom": "canvas_hotkey_reset",
|
"Reset Zoom": "canvas_hotkey_reset",
|
||||||
"Overlap": "canvas_hotkey_overlap",
|
"Overlap": "canvas_hotkey_overlap"
|
||||||
};
|
};
|
||||||
|
|
||||||
// Loading the configuration from opts
|
// Loading the configuration from opts
|
||||||
const preHotkeysConfig = createHotkeyConfig(
|
const preHotkeysConfig = createHotkeyConfig(
|
||||||
@ -213,7 +222,7 @@ onUiLoaded(async() => {
|
|||||||
const hotkeysConfig = disableFunctions(
|
const hotkeysConfig = disableFunctions(
|
||||||
preHotkeysConfig,
|
preHotkeysConfig,
|
||||||
preHotkeysConfig.canvas_disabled_functions
|
preHotkeysConfig.canvas_disabled_functions
|
||||||
);
|
);
|
||||||
|
|
||||||
let isMoving = false;
|
let isMoving = false;
|
||||||
let mouseX, mouseY;
|
let mouseX, mouseY;
|
||||||
@ -274,36 +283,47 @@ onUiLoaded(async() => {
|
|||||||
|
|
||||||
// Define an array with hotkey information and their actions
|
// Define an array with hotkey information and their actions
|
||||||
const hotkeysInfo = [
|
const hotkeysInfo = [
|
||||||
{ configKey: "canvas_hotkey_zoom", action: "Zoom canvas", keySuffix: " + wheel" },
|
{
|
||||||
{ configKey: "canvas_hotkey_adjust", action: "Adjust brush size", keySuffix: " + wheel" },
|
configKey: "canvas_hotkey_zoom",
|
||||||
{ configKey: "canvas_hotkey_reset", action: "Reset zoom" },
|
action: "Zoom canvas",
|
||||||
{ configKey: "canvas_hotkey_fullscreen", action: "Fullscreen mode" },
|
keySuffix: " + wheel"
|
||||||
{ configKey: "canvas_hotkey_move", action: "Move canvas" },
|
},
|
||||||
{ configKey: "canvas_hotkey_overlap", action: "Overlap" },
|
{
|
||||||
|
configKey: "canvas_hotkey_adjust",
|
||||||
|
action: "Adjust brush size",
|
||||||
|
keySuffix: " + wheel"
|
||||||
|
},
|
||||||
|
{configKey: "canvas_hotkey_reset", action: "Reset zoom"},
|
||||||
|
{
|
||||||
|
configKey: "canvas_hotkey_fullscreen",
|
||||||
|
action: "Fullscreen mode"
|
||||||
|
},
|
||||||
|
{configKey: "canvas_hotkey_move", action: "Move canvas"},
|
||||||
|
{configKey: "canvas_hotkey_overlap", action: "Overlap"}
|
||||||
];
|
];
|
||||||
|
|
||||||
// Create hotkeys array with disabled property based on the config values
|
// Create hotkeys array with disabled property based on the config values
|
||||||
const hotkeys = hotkeysInfo.map((info) => {
|
const hotkeys = hotkeysInfo.map(info => {
|
||||||
const configValue = hotkeysConfig[info.configKey];
|
const configValue = hotkeysConfig[info.configKey];
|
||||||
const key = info.keySuffix
|
const key = info.keySuffix ?
|
||||||
? `${configValue}${info.keySuffix}`
|
`${configValue}${info.keySuffix}` :
|
||||||
: configValue.charAt(configValue.length - 1);
|
configValue.charAt(configValue.length - 1);
|
||||||
return {
|
return {
|
||||||
key,
|
key,
|
||||||
action: info.action,
|
action: info.action,
|
||||||
disabled: configValue === "disable",
|
disabled: configValue === "disable"
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const hotkey of hotkeys) {
|
for (const hotkey of hotkeys) {
|
||||||
if (hotkey.disabled) {
|
if (hotkey.disabled) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const p = document.createElement("p");
|
const p = document.createElement("p");
|
||||||
p.innerHTML = `<b>${hotkey.key}</b> - ${hotkey.action}`;
|
p.innerHTML = `<b>${hotkey.key}</b> - ${hotkey.action}`;
|
||||||
tooltipContent.appendChild(p);
|
tooltipContent.appendChild(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add information and content elements to the tooltip element
|
// Add information and content elements to the tooltip element
|
||||||
tooltip.appendChild(info);
|
tooltip.appendChild(info);
|
||||||
|
Loading…
Reference in New Issue
Block a user