projects/emailtemplate.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asdasd

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-01-19 00:59:24 +01:00
parent 64d1fb072a
commit e761b62ac2
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
public/editor/bridge-core.js
View File

@@ -947,24 +947,42 @@
&& !hasPages && !hasPages
&& (parsedState.components || parsedState.styles); && (parsedState.components || parsedState.styles);
if (isArray) { if (isArray) {
ed.setComponents(parsedState); const looksHtmlWrapper = parsedState.length === 1 && parsedState[0] && parsedState[0].type === 'html';
applied = true; if (!looksHtmlWrapper) {
log('CONTENT', 'JSON-Komponenten (Array) angewendet.', 'orange');
} else if (isLegacy) {
if (parsedState.components) {
ed.setComponents(parsedState.components);
} else {
ed.setComponents(parsedState); ed.setComponents(parsedState);
applied = true;
log('CONTENT', 'JSON-Komponenten (Array) angewendet.', 'orange');
} else {
log('CONTENT WARN', 'JSON enthält nur HTML-Wrapper, nutze HTML-Fallback.', 'orange', 'warn');
applied = false;
} }
if (parsedState.styles) { } else if (isLegacy) {
ed.setStyle(parsedState.styles); const legacyComponents = parsedState.components || parsedState;
const looksHtmlWrapper = Array.isArray(legacyComponents)
&& legacyComponents.length === 1
&& legacyComponents[0]
&& legacyComponents[0].type === 'html';
if (!looksHtmlWrapper) {
ed.setComponents(legacyComponents);
if (parsedState.styles) {
ed.setStyle(parsedState.styles);
}
applied = true;
log('CONTENT', 'Legacy JSON (components/styles) angewendet.', 'orange');
} else {
log('CONTENT WARN', 'Legacy JSON enthält nur HTML-Wrapper, nutze HTML-Fallback.', 'orange', 'warn');
applied = false;
} }
applied = true;
log('CONTENT', 'Legacy JSON (components/styles) angewendet.', 'orange');
} else if (parsedState && typeof parsedState === 'object' && !hasPages) { } else if (parsedState && typeof parsedState === 'object' && !hasPages) {
ed.setComponents(parsedState); const looksHtmlWrapper = parsedState && parsedState.type === 'html';
applied = true; if (!looksHtmlWrapper) {
log('CONTENT', 'JSON ohne Pages als Komponenten angewendet.', 'orange'); ed.setComponents(parsedState);
applied = true;
log('CONTENT', 'JSON ohne Pages als Komponenten angewendet.', 'orange');
} else {
log('CONTENT WARN', 'JSON ohne Pages ist HTML-Wrapper, nutze HTML-Fallback.', 'orange', 'warn');
applied = false;
}
} else { } else {
ed.loadProjectData(parsedState); ed.loadProjectData(parsedState);
applied = true; applied = true;

5
src/ApiKernel.php
View File

@@ -481,11 +481,6 @@ class ApiKernel
$gjsComponents = $this->parseHtmlToGjsComponents($topHtml); $gjsComponents = $this->parseHtmlToGjsComponents($topHtml);
} }
if ($editorType === 'grapesjs' && $jsonCol && empty($topContent) && $topHtml !== null) {
$pendingUpdate[$jsonCol] = $this->encodeJson($gjsComponents);
$topContent = $pendingUpdate[$jsonCol];
$rowOut[$jsonCol] = $pendingUpdate[$jsonCol];
}
if ($editorType === 'craftjs' && $craftCol) { if ($editorType === 'craftjs' && $craftCol) {
$craftPayload = isset($row[$craftCol]) ? (string)$row[$craftCol] : ''; $craftPayload = isset($row[$craftCol]) ? (string)$row[$craftCol] : '';
if ($craftPayload === '') { if ($craftPayload === '') {