OSSForks/ollama-webui
1
0
Fork 0
mirror of https://github.com/zebrajr/ollama-webui.git synced 2025-12-06 12:19:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18195 from EventHorizon-AI/fix/artifacts-duplicate-match

Browse Source 
fix: Artifacts duplicate matching
This commit is contained in:
Tim Jaeryang Baek 2025-10-09 14:22:00 -05:00 committed by GitHub
commit b93e9b1698
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/lib/components/chat/Artifacts.svelte
View File

@ -39,51 +39,51 @@
const codeBlockContents = message.content.match(/```[\s\S]*?```/g); const codeBlockContents = message.content.match(/```[\s\S]*?```/g);
let codeBlocks = []; let codeBlocks = [];
let htmlContent = '';
let cssContent = '';
let jsContent = '';
if (codeBlockContents) { if (codeBlockContents) {
codeBlockContents.forEach((block) => { codeBlockContents.forEach((block) => {
const lang = block.split('\n')[0].replace('```', '').trim().toLowerCase(); const lang = block.split('\n')[0].replace('```', '').trim().toLowerCase();
const code = block.replace(/```[\s\S]*?\n/, '').replace(/```$/, ''); const code = block.replace(/```[\s\S]*?\n/, '').replace(/```$/, '');
codeBlocks.push({ lang, code }); codeBlocks.push({ lang, code });
}); });
}
let htmlContent = ''; codeBlocks.forEach((block) => {
let cssContent = ''; const { lang, code } = block;
let jsContent = '';
codeBlocks.forEach((block) => { if (lang === 'html') {
const { lang, code } = block; htmlContent += code + '\n';
} else if (lang === 'css') {
cssContent += code + '\n';
} else if (lang === 'javascript' || lang === 'js') {
jsContent += code + '\n';
}
});
} else {
const inlineHtml = message.content.match(/<html>[\s\S]*?<\/html>/gi);
const inlineCss = message.content.match(/<style>[\s\S]*?<\/style>/gi);
const inlineJs = message.content.match(/<script>[\s\S]*?<\/script>/gi);
if (lang === 'html') { if (inlineHtml) {
htmlContent += code + '\n'; inlineHtml.forEach((block) => {
} else if (lang === 'css') { const content = block.replace(/<\/?html>/gi, ''); // Remove <html> tags
cssContent += code + '\n'; htmlContent += content + '\n';
} else if (lang === 'javascript' || lang === 'js') { });
jsContent += code + '\n'; }
if (inlineCss) {
inlineCss.forEach((block) => {
const content = block.replace(/<\/?style>/gi, ''); // Remove <style> tags
cssContent += content + '\n';
});
}
if (inlineJs) {
inlineJs.forEach((block) => {
const content = block.replace(/<\/?script>/gi, ''); // Remove <script> tags
jsContent += content + '\n';
});
} }
});
const inlineHtml = message.content.match(/<html>[\s\S]*?<\/html>/gi);
const inlineCss = message.content.match(/<style>[\s\S]*?<\/style>/gi);
const inlineJs = message.content.match(/<script>[\s\S]*?<\/script>/gi);
if (inlineHtml) {
inlineHtml.forEach((block) => {
const content = block.replace(/<\/?html>/gi, ''); // Remove <html> tags
htmlContent += content + '\n';
});
}
if (inlineCss) {
inlineCss.forEach((block) => {
const content = block.replace(/<\/?style>/gi, ''); // Remove <style> tags
cssContent += content + '\n';
});
}
if (inlineJs) {
inlineJs.forEach((block) => {
const content = block.replace(/<\/?script>/gi, ''); // Remove <script> tags
jsContent += content + '\n';
});
} }
if (htmlContent || cssContent || jsContent) { if (htmlContent || cssContent || jsContent) {