Skip to content

Commit 98bbfc6

Browse files
MC-3479: Remove Accordion
- rename variables and remove try block
1 parent 1c45409 commit 98bbfc6

File tree

3 files changed

+21
-31
lines changed

3 files changed

+21
-31
lines changed

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Accordion.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,14 @@ public function render(array $itemData, array $additionalData = []) : string
7373
}
7474
}
7575

76-
$accordionElementHtml = '<div';
76+
$accordionHtml = '<div';
7777
foreach ($rootElementAttributes as $attributeName => $attributeValue) {
78-
$accordionElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
78+
$accordionHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
7979
}
80-
$accordionElementHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') .
81-
'</div>';
80+
$accordionHtml .= '>' . (isset($additionalData['children']) ? $additionalData['children'] : '') . '</div>';
8281

8382
$rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
84-
$rootElementHtml .= $accordionElementHtml . '</div>';
83+
$rootElementHtml .= $accordionHtml . '</div>';
8584

8685
return $rootElementHtml;
8786
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js

Lines changed: 10 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,14 @@ function getElementData(element: HTMLElement, config: ContentTypeConfigInterface
112112
resolve(result);
113113
} else {
114114
const readerComponents = appearanceConfig(role, element.dataset.appearance).reader;
115-
try {
116-
loadReader([readerComponents], (...readers: any[]) => {
117-
const Reader = readers.pop();
118-
const reader = new Reader();
119-
reader.read(element).then((readerData: any) => {
120-
_.extend(result, readerData);
121-
resolve(result);
122-
});
115+
loadReader([readerComponents], (...readers: any[]) => {
116+
const ReaderComponent = readers.pop();
117+
const reader = new ReaderComponent();
118+
reader.read(element).then((readerData: any) => {
119+
_.extend(result, readerData);
120+
resolve(result);
123121
});
124-
} catch (e) {
125-
reject(e);
126-
}
122+
});
127123
}
128124
});
129125
}

0 commit comments

Comments
 (0)