Skip to content

Commit 2e46deb

Browse files
committed
chore: call search in the core functions
1 parent 877133c commit 2e46deb

1 file changed

Lines changed: 59 additions & 57 deletions

File tree

src/livecodes/core.ts

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
getResultElement,
1313
loadingMessage,
1414
noUserTemplates,
15+
setupTemplatesSearch,
1516
} from './UI';
1617
import type {
1718
BroadcastData,
@@ -249,18 +250,18 @@ const loadStyles = () =>
249250
isHeadless
250251
? Promise.resolve()
251252
: Promise.all(
252-
[
253-
snackbarUrl,
254-
...(isLite
255-
? []
256-
: [
257-
lunaObjViewerStylesUrl,
258-
lunaDataGridStylesUrl,
259-
lunaDomViewerStylesUrl,
260-
lunaConsoleStylesUrl,
261-
]),
262-
].map((url) => loadStylesheet(url, undefined, '#app-styles')),
263-
);
253+
[
254+
snackbarUrl,
255+
...(isLite
256+
? []
257+
: [
258+
lunaObjViewerStylesUrl,
259+
lunaDataGridStylesUrl,
260+
lunaDomViewerStylesUrl,
261+
lunaConsoleStylesUrl,
262+
]),
263+
].map((url) => loadStylesheet(url, undefined, '#app-styles')),
264+
);
264265

265266
let lastRun = { time: 0, result: '' };
266267
const createIframe = (container: HTMLElement, result = '', service = sandboxService) =>
@@ -352,12 +353,11 @@ const createIframe = (container: HTMLElement, result = '', service = sandboxServ
352353

353354
iframe.remove(); // avoid changing browser history
354355
const { markup, style, script } = getConfig();
355-
const query = `?markup=${markup.language}&style=${style.language}&script=${
356-
script.language
357-
}&isEmbed=${isEmbed}&isLoggedIn=${Boolean(authService?.isLoggedIn())}&appCDN=${getAppCDN()}`;
356+
const query = `?markup=${markup.language}&style=${style.language}&script=${script.language
357+
}&isEmbed=${isEmbed}&isLoggedIn=${Boolean(authService?.isLoggedIn())}&appCDN=${getAppCDN()}`;
358358
const scrollPosition =
359359
params.scrollPosition === false ||
360-
(iframeScrollPosition.x === 0 && iframeScrollPosition.y === 0)
360+
(iframeScrollPosition.x === 0 && iframeScrollPosition.y === 0)
361361
? ''
362362
: `#livecodes-scroll-position:${iframeScrollPosition.x},${iframeScrollPosition.y}`;
363363
iframe.src = service.getResultUrl() + query + scrollPosition;
@@ -504,7 +504,7 @@ const createEditors = async (config: Config) => {
504504
language: languageIsEnabled(config.markup.language, config)
505505
? config.markup.language
506506
: (config.languages?.find((lang) => getLanguageEditorId(lang) === 'markup') as Language) ||
507-
'html',
507+
'html',
508508
value: languageIsEnabled(config.markup.language, config) ? config.markup.content || '' : '',
509509
};
510510
const styleOptions: EditorOptions = {
@@ -514,7 +514,7 @@ const createEditors = async (config: Config) => {
514514
language: languageIsEnabled(config.style.language, config)
515515
? config.style.language
516516
: (config.languages?.find((lang) => getLanguageEditorId(lang) === 'style') as Language) ||
517-
'css',
517+
'css',
518518
value: languageIsEnabled(config.style.language, config) ? config.style.content || '' : '',
519519
};
520520
const scriptOptions: EditorOptions = {
@@ -524,7 +524,7 @@ const createEditors = async (config: Config) => {
524524
language: languageIsEnabled(config.script.language, config)
525525
? config.script.language
526526
: (config.languages?.find((lang) => getLanguageEditorId(lang) === 'script') as Language) ||
527-
'javascript',
527+
'javascript',
528528
value: languageIsEnabled(config.script.language, config) ? config.script.content || '' : '',
529529
};
530530

@@ -981,12 +981,12 @@ const getResultPage = async ({
981981
blockly:
982982
scriptLanguage === 'blockly'
983983
? ((await customEditors.blockly?.getContent({
984-
baseUrl,
985-
editors,
986-
config: getConfig(),
987-
html: compiledMarkup,
988-
eventsManager,
989-
})) as BlocklyContent)
984+
baseUrl,
985+
editors,
986+
config: getConfig(),
987+
html: compiledMarkup,
988+
eventsManager,
989+
})) as BlocklyContent)
990990
: {},
991991
});
992992
const compiledScript = scriptCompileResult.code;
@@ -1327,28 +1327,28 @@ const share = async (
13271327
const config = getConfig();
13281328
const content = contentOnly
13291329
? {
1330-
...getContentConfig(config),
1331-
markup: {
1332-
...config.markup,
1333-
title: undefined,
1334-
hideTitle: undefined,
1335-
},
1336-
style: {
1337-
...config.style,
1338-
title: undefined,
1339-
hideTitle: undefined,
1340-
},
1341-
script: {
1342-
...config.script,
1343-
title: undefined,
1344-
hideTitle: undefined,
1345-
},
1346-
tools: {
1347-
...config.tools,
1348-
enabled: defaultConfig.tools.enabled,
1349-
status: config.tools.status === 'none' ? defaultConfig.tools.status : config.tools.status,
1350-
},
1351-
}
1330+
...getContentConfig(config),
1331+
markup: {
1332+
...config.markup,
1333+
title: undefined,
1334+
hideTitle: undefined,
1335+
},
1336+
style: {
1337+
...config.style,
1338+
title: undefined,
1339+
hideTitle: undefined,
1340+
},
1341+
script: {
1342+
...config.script,
1343+
title: undefined,
1344+
hideTitle: undefined,
1345+
},
1346+
tools: {
1347+
...config.tools,
1348+
enabled: defaultConfig.tools.enabled,
1349+
status: config.tools.status === 'none' ? defaultConfig.tools.status : config.tools.status,
1350+
},
1351+
}
13521352
: config;
13531353

13541354
const currentUrl = (location.origin + location.pathname).split('/').slice(0, -1).join('/') + '/';
@@ -1630,7 +1630,7 @@ const setSavedStatus = async () => {
16301630
!!(
16311631
savedConfig &&
16321632
JSON.stringify(getContentConfig(savedConfig)) ===
1633-
JSON.stringify(getContentConfig(getConfig()))
1633+
JSON.stringify(getContentConfig(getConfig()))
16341634
);
16351635

16361636
const projectTitle = UI.getProjectTitleElement();
@@ -1812,12 +1812,12 @@ const login = async () =>
18121812
const displayName = user.displayName || user.username;
18131813
const loginSuccessMessage = displayName
18141814
? window.deps.translateString(
1815-
'core.login.successWithName',
1816-
'Logged in as: {{name}}',
1817-
{
1818-
name: displayName,
1819-
},
1820-
)
1815+
'core.login.successWithName',
1816+
'Logged in as: {{name}}',
1817+
{
1818+
name: displayName,
1819+
},
1820+
)
18211821
: window.deps.translateString('core.login.success', 'Logged in successfully');
18221822
notifications.success(loginSuccessMessage);
18231823
displayLoggedIn(user);
@@ -2590,9 +2590,9 @@ const handleKeyboardShortcutsScreen = () => {
25902590
<tr>
25912591
<td>${item.title}</td>
25922592
<td>${item.hotkey
2593-
?.split('+')
2594-
.map((key) => `<kbd>${capitalize(key)}</kbd>`)
2595-
.join(' ')}</td>
2593+
?.split('+')
2594+
.map((key) => `<kbd>${capitalize(key)}</kbd>`)
2595+
.join(' ')}</td>
25962596
</tr>
25972597
`,
25982598
)
@@ -3150,6 +3150,8 @@ const handleNew = () => {
31503150
const templatesContainer = createTemplatesContainer(eventsManager, () => loadUserTemplates());
31513151
const userTemplatesScreen = UI.getUserTemplatesScreen(templatesContainer);
31523152

3153+
setupTemplatesSearch();
3154+
31533155
const loadUserTemplates = async () => {
31543156
const defaultTemplate = getAppData()?.defaultTemplate;
31553157
const userTemplates = ((await stores.templates?.getList()) || []).sort((a, b) =>

0 commit comments

Comments
 (0)