Refactor expression popups to modern popup
| @@ -1,6 +1,6 @@ | |||
| 1 | import { Fuse } from '../../../lib.js'; | 1 | import { Fuse } from '../../../lib.js'; |
| 2 | 2 | ||
| 3 | import { callPopup, eventSource, event_types, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types } from '../../../script.js'; | 3 | import { eventSource, event_types, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types } from '../../../script.js'; |
| 4 | import { dragElement, isMobile } from '../../RossAscends-mods.js'; | 4 | import { dragElement, isMobile } from '../../RossAscends-mods.js'; |
| 5 | import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js'; | 5 | import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js'; |
| 6 | import { loadMovingUIState, power_user } from '../../power-user.js'; | 6 | import { loadMovingUIState, power_user } from '../../power-user.js'; |
| @@ -1739,7 +1739,7 @@ function onClickExpressionImage() { | |||
| 1739 | 1739 | ||
| 1740 | async function onClickExpressionAddCustom() { | 1740 | async function onClickExpressionAddCustom() { |
| 1741 | const template = await renderExtensionTemplateAsync(MODULE_NAME, 'add-custom-expression'); | 1741 | const template = await renderExtensionTemplateAsync(MODULE_NAME, 'add-custom-expression'); |
| 1742 | let expressionName = await callPopup(template, 'input'); | 1742 | let expressionName = await Popup.show.input(null, template); |
| 1743 | 1743 | ||
| 1744 | if (!expressionName) { | 1744 | if (!expressionName) { |
| 1745 | console.debug('No custom expression name provided'); | 1745 | console.debug('No custom expression name provided'); |
| @@ -1786,7 +1786,7 @@ async function onClickExpressionRemoveCustom() { | |||
| 1786 | } | 1786 | } |
| 1787 | 1787 | ||
| 1788 | const template = await renderExtensionTemplateAsync(MODULE_NAME, 'remove-custom-expression', { expression: selectedExpression }); | 1788 | const template = await renderExtensionTemplateAsync(MODULE_NAME, 'remove-custom-expression', { expression: selectedExpression }); |
| 1789 | const confirmation = await callPopup(template, 'confirm'); | 1789 | const confirmation = await Popup.show.confirm(null, template); |
| 1790 | 1790 | ||
| 1791 | if (!confirmation) { | 1791 | if (!confirmation) { |
| 1792 | console.debug('Custom expression removal cancelled'); | 1792 | console.debug('Custom expression removal cancelled'); |