Skip to content

Commit 139d5f9

Browse files
committed
minor edge case error prevention
1 parent 9ee5740 commit 139d5f9

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/wwwroot/js/genpage/gentab/layout.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ class GenTabLayout {
510510
});
511511
}
512512
this.altText.addEventListener('keydown', (e) => {
513-
if (e.key == 'Enter' && !e.shiftKey && getUserSetting('enterkeygenerates', 'true')) {
513+
if (e.key == 'Enter' && !e.shiftKey && internalSiteJsGetUserSetting('enterkeygenerates', 'true')) {
514514
this.altText.dispatchEvent(new Event('change'));
515515
getRequiredElementById('alt_generate_button').click();
516516
e.preventDefault();
@@ -519,7 +519,7 @@ class GenTabLayout {
519519
}
520520
});
521521
this.altNegText.addEventListener('keydown', (e) => {
522-
if (e.key == 'Enter' && !e.shiftKey && getUserSetting('enterkeygenerates', 'true')) {
522+
if (e.key == 'Enter' && !e.shiftKey && internalSiteJsGetUserSetting('enterkeygenerates', 'true')) {
523523
this.altNegText.dispatchEvent(new Event('change'));
524524
getRequiredElementById('alt_generate_button').click();
525525
e.preventDefault();

src/wwwroot/js/site.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,13 @@ function textPromptInputHandle(elem) {
285285
textPromptDoCount(elem);
286286
}
287287

288+
function internalSiteJsGetUserSetting(name, defaultValue) {
289+
if (typeof getUserSetting == 'function') {
290+
return getUserSetting(name, defaultValue);
291+
}
292+
return defaultValue;
293+
}
294+
288295
function textPromptAddKeydownHandler(elem) {
289296
let shiftText = (up) => {
290297
let selStart = elem.selectionStart;
@@ -389,7 +396,7 @@ function textPromptAddKeydownHandler(elem) {
389396
e.stopPropagation();
390397
return false;
391398
}
392-
if (e.altKey && (e.key == 'ArrowLeft' || e.key == 'ArrowRight') && getUserSetting('ui.tagmovehotkeyenabled', false)) {
399+
if (e.altKey && (e.key == 'ArrowLeft' || e.key == 'ArrowRight') && internalSiteJsGetUserSetting('ui.tagmovehotkeyenabled', false)) {
393400
moveCommaSeparatedElement(e.key == 'ArrowLeft');
394401
e.preventDefault();
395402
e.stopPropagation();
@@ -667,7 +674,7 @@ function makeSecretInput(featureid, id, paramid, name, description, value, place
667674
}
668675

669676
function dynamicSizeTextBox(elem, min=15) {
670-
let maxHeight = parseInt(getUserSetting('maxpromptlines', '10'));
677+
let maxHeight = parseInt(internalSiteJsGetUserSetting('maxpromptlines', '10'));
671678
elem.style.height = '0px';
672679
let height = elem.scrollHeight;
673680
let fontSize = parseFloat(window.getComputedStyle(elem).fontSize);
@@ -940,10 +947,10 @@ function specialDebug(message) {
940947
}
941948

942949
function playCompletionAudio() {
943-
let audioFile = getUserSetting('audio.completionsound');
950+
let audioFile = internalSiteJsGetUserSetting('audio.completionsound', null);
944951
if (audioFile) {
945952
let audio = new Audio(`/Audio/${audioFile}`);
946-
audio.volume = parseFloat(getUserSetting('audio.volume', '0.5'));
953+
audio.volume = parseFloat(internalSiteJsGetUserSetting('audio.volume', '0.5'));
947954
audio.play();
948955
}
949956
}

0 commit comments

Comments
 (0)