diff --git a/public/script.js b/public/script.js index 7d4ea3a37..5c360c0ef 100644 --- a/public/script.js +++ b/public/script.js @@ -169,7 +169,6 @@ import { import { EventEmitter } from './lib/eventemitter.js'; import { markdownExclusionExt } from './scripts/showdown-exclusion.js'; import { NOTE_MODULE_NAME, initAuthorsNote, metadata_keys, setFloatingPrompt, shouldWIAddPrompt } from './scripts/authors-note.js'; -import { getDeviceInfo } from './scripts/RossAscends-mods.js'; import { registerPromptManagerMigration } from './scripts/PromptManager.js'; import { getRegexedString, regex_placement } from './scripts/extensions/regex/engine.js'; import { FILTER_TYPES, FilterHelper } from './scripts/filters.js'; @@ -6834,8 +6833,7 @@ function openCharacterWorldPopup() { template.find('.character_name').text(name); // Not needed on mobile - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + if (!isMobile()) { $(extraSelect).select2({ width: '100%', placeholder: 'No auxillary Lorebooks set. Click here to select.', @@ -7812,7 +7810,7 @@ function addDebugFunctions() { jQuery(async function () { - if (isMobile() === true) { + if (isMobile()) { console.debug('hiding movingUI and sheldWidth toggles for mobile'); $('#sheldWidthToggleBlock').hide(); $('#movingUIModeCheckBlock').hide(); diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 0cf4fa5c3..ffa1c1640 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -113,7 +113,7 @@ export function isMobile() { * Loads device info from the server. Caches the result in sessionStorage. * @returns {object} - The device info object. */ -export function getDeviceInfo() { +function getDeviceInfo() { let deviceInfo = null; if (sessionStorage.getItem('deviceInfo')) { @@ -431,8 +431,7 @@ function RA_autoconnect(PrevApi) { } function OpenNavPanels() { - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + if (!isMobile()) { //auto-open R nav if locked and previously open if (LoadLocalBool('NavLockOn') == true && LoadLocalBool('NavOpened') == true) { //console.log("RA -- clicking right nav to open"); diff --git a/public/scripts/horde.js b/public/scripts/horde.js index fbf6bf0d4..f860b159c 100644 --- a/public/scripts/horde.js +++ b/public/scripts/horde.js @@ -9,7 +9,7 @@ import { } from '../script.js'; import { SECRET_KEYS, writeSecret } from './secrets.js'; import { delay } from './utils.js'; -import { getDeviceInfo } from './RossAscends-mods.js'; +import { isMobile } from './RossAscends-mods.js'; import { autoSelectInstructPreset } from './instruct-mode.js'; export { @@ -303,8 +303,7 @@ jQuery(function () { $('#horde_kudos').on('click', showKudos); // Not needed on mobile - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + if (!isMobile()) { $('#horde_model').select2({ width: '100%', placeholder: 'Select Horde models', diff --git a/public/scripts/mancer-settings.js b/public/scripts/mancer-settings.js index 422a51ab4..0a08fede8 100644 --- a/public/scripts/mancer-settings.js +++ b/public/scripts/mancer-settings.js @@ -1,5 +1,5 @@ import { setGenerationParamsFromPreset } from '../script.js'; -import { getDeviceInfo } from './RossAscends-mods.js'; +import { isMobile } from './RossAscends-mods.js'; import { textgenerationwebui_settings as textgen_settings } from './textgen-settings.js'; let models = []; @@ -52,8 +52,7 @@ function getMancerModelTemplate(option) { jQuery(function () { $('#mancer_model').on('change', onMancerModelSelect); - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + if (!isMobile()) { $('#mancer_model').select2({ placeholder: 'Select a model', searchInputPlaceholder: 'Search models...', diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js index 3ab3fbfa4..509da95ea 100644 --- a/public/scripts/world-info.js +++ b/public/scripts/world-info.js @@ -3,7 +3,7 @@ import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, import { extension_settings, getContext } from './extensions.js'; import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js'; import { registerSlashCommand } from './slash-commands.js'; -import { getDeviceInfo } from './RossAscends-mods.js'; +import { isMobile } from './RossAscends-mods.js'; import { FILTER_TYPES, FilterHelper } from './filters.js'; import { getTokenCount } from './tokenizers.js'; import { power_user } from './power-user.js'; @@ -896,8 +896,8 @@ function getWorldEntry(name, data, entry) { const characterFilter = template.find('select[name="characterFilter"]'); characterFilter.data('uid', entry.uid); - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + + if (!isMobile()) { $(characterFilter).select2({ width: '100%', placeholder: 'All characters will pull from this entry.', @@ -2551,8 +2551,7 @@ jQuery(() => { $(document).on('click', '.chat_lorebook_button', assignLorebookToChat); // Not needed on mobile - const deviceInfo = getDeviceInfo(); - if (deviceInfo && deviceInfo.device.type === 'desktop') { + if (!isMobile()) { $('#world_info').select2({ width: '100%', placeholder: 'No Worlds active. Click here to select.',