Skip to content

Commit c0bf16f

Browse files
committed
Merge branch '1.0.0-beta-release' into develop
# Conflicts: # docs/reference/events.md
2 parents 6a9ef47 + 8e089fd commit c0bf16f

File tree

6 files changed

+115
-18
lines changed

6 files changed

+115
-18
lines changed

docs/breaking-changes.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Breaking changes in 1.0.0-beta7
2+
3+
As hard as we tried to avoid breaking changes during our beta program, we felt compelled to clarify certain names within Page Builder to help developers better understand their purpose. As a result these changes **will break** existing content within previous beta versions, along with any custom content types you've created.
4+
5+
A summary of the changes is shown here, followed by the details on how to update your existing content:
6+
7+
- `data-role` to `data-content-type`
8+
- `group` to `menu_section`
9+
- `render_template` to `master_template`
10+
- `is_visible` to `is_system`
11+
- `renderChildTemplate` to `masterTemplate`
12+
- `previewChildTemplate` to `childTemplate`
13+
- `renderTemplate` and `previewTemplate` to `template`
14+
15+
We’re sorry if these changes cause you any disruption. But we strongly believe they will improve product understanding for all future developers.
16+
17+
## Master Format Changes
18+
19+
The `data-role` attribute is now called `data-content-type`. We strongly believe this makes understanding the purpose of the element and attribute much easier, as `data-role` is already used for several other features in Magento.
20+
21+
This change causes existing content to load as HTML code within your content type. To fix this issue, run the following command on your MySQL database:
22+
23+
```sql
24+
UPDATE cms_page SET content = REPLACE(content, 'data-role="', 'data-content-type="');
25+
UPDATE cms_block SET content = REPLACE(content, 'data-role="', 'data-content-type="');
26+
UPDATE magento_banner_content SET banner_content = REPLACE(banner_content, 'data-role="', 'data-content-type="');
27+
UPDATE catalog_category_entity_text SET value = REPLACE(value, 'data-role="', 'data-content-type="');
28+
UPDATE catalog_product_entity_text SET value = REPLACE(value, 'data-role="', 'data-content-type="');
29+
```
30+
31+
## XML Changes
32+
33+
The `group` system has been renamed to `menu_section`, resulting in the following changes:
34+
35+
- The `group.xml`, `group.xsd`, and `group_merged.xsd` files are now called `menu_section.xml`, `menu_section.xsd`, and `menu_section_merged.xsd`, but are located in the same places and have the same purposes. Nodes within these files have also been updated from `<group />` to `<menu_section />`.
36+
37+
- The `group` attribute is now called `menu_section`. If you've implemented a custom content type, you will need to update this attribute within your content type's configuration file. For example:
38+
39+
```xml
40+
<type name="example_quote"
41+
label="Quote"
42+
menu_section="elements"
43+
```
44+
45+
- For any panel extensions you may have done, you will need to change your panel import references from `Magento_PageBuilder/js/panel/group` to `Magento_PageBuilder/js/panel/menuSections`, as well as any reader class references from `Magento\PageBuilder\Model\Config\Group` classes to `Magento\PageBuilder\Model\Config\MenuSection` classes, as necessary.
46+
47+
## JavaScript Changes
48+
49+
We've also improved the naming of various properties in the JavaScript classes we ship within Page Builder. These changes may result in your custom extensions referencing properties that are no longer available.
50+
51+
- A content type's parent content type is now referenced as `parentContentType` instead of just `parent`, this was changed in `content-type.ts` and `content-type-collection.ts`. If you're traversing up the tree you will need to update this reference.
52+
53+
- From the `preview` and `master` components, you now access the content type instance through `contentType` instead of previously using `parent`. For example, event code using `parent` will need to be updated to contentType:
54+
55+
```js
56+
events.on(`${this.config.name}:${this.parent.id}:updateAfter`, function (args) {
57+
console.log(self.parent);
58+
});
59+
```
60+
61+
Changes to:
62+
63+
```js
64+
events.on(`${this.config.name}:${this.contentType.id}:updateAfter`, function (args) {
65+
console.log(self.contentType);
66+
});
67+
```
68+
69+
- `render_template` is renamed to `master_template`:
70+
71+
```xml
72+
<appearance name="default"
73+
preview_template="Example_PageBuilderQuote/content-type/example-quote/default/preview"
74+
render_template="Example_PageBuilderQuote/content-type/example-quote/default/master"
75+
reader="Magento_PageBuilder/js/master-format/read/configurable">
76+
```
77+
78+
Changes to:
79+
80+
```xml
81+
<appearance name="default"
82+
preview_template="Example_PageBuilderQuote/content-type/example-quote/default/preview"
83+
master_template="Example_PageBuilderQuote/content-type/example-quote/default/master"
84+
reader="Magento_PageBuilder/js/master-format/read/configurable">
85+
```
86+
87+
88+
89+
- `is_visible` is renamed to `is_system`. If your content type modifies this attribute, you will need to update your reference in the configuration file.
90+
91+
- `renderChildTemplate` is renamed to `masterTemplate` and `previewChildTemplate` is renamed to `childTemplate`. If you have a container content type which renders children, you will need to update these references in your code.

docs/comp-status2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Component status
22

3-
**Last Updated: January 14, 2019**
3+
**Last Updated: February 14, 2019**
44

55
<style type="text/css" style="display: none">
66
.status {

docs/configurations/responsive-layout-configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This topic describes how to change the default mobile breakpoint in Page Builder
44

55
## Default mobile breakpoint
66

7-
By default, when you configure Page Builder to render a background image for a container, it uses a mobile image when the container's width is equal to and less than 768px. Page Builder defines this mobile breakpoint in the `Magento_PageBuilder/etc/view.xml` file, as shown here:
7+
By default, when you configure Page Builder to render a background image for a container, it uses a mobile image when the container's width is equal to or less than 768px. Page Builder defines this mobile breakpoint in the `Magento_PageBuilder/etc/view.xml` file, as shown here:
88

99
```xml
1010
<?xml version="1.0"?>
@@ -49,4 +49,4 @@ In either case, if your theme uses a mobile breakpoint `max-width` of `600px`, y
4949
</view>
5050
```
5151

52-
This directs Page Builder to use this mobile breakpoint instead of its default breakpoint of 768px. Other responsive breakpoints from your custom theme can be added in the same way.
52+
This directs Page Builder to use this mobile breakpoint instead of its default breakpoint of 768px. You can add other responsive breakpoints from your custom theme in the same way.

docs/page-builder.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ url: /page-builder/
33
versionless: true
44
pages:
55
- label: Getting started
6+
url: /page-builder/getting-started/introduction.html
7+
versionless: true
68
children:
79
- label: Install Page Builder
810
url: /page-builder/getting-started/install-pagebuilder.html

docs/reference/events.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ The following table lists the Page Builder events you can bind to and handle wit
3636
| | [stage:updateAfter](#stageupdateafter) |
3737
| | |
3838
| **Column Events** | **Preview Events** |
39-
| [column:dragStart](#columndragstart) | [previewSortable:sortstart](#previewsortablesortstart) |
40-
| [column:dragStop](#columndragstop) | [previewSortable:sortupdate](#previewsortablesortupdate) |
39+
| [column:dragStart](#columndragstart) | [childContentType:sortstart](#childcontenttypesortstart) |
40+
| [column:dragStop](#columndragstop) | [childContentType:sortupdate](#childcontenttypesortupdate) |
4141
| [column:initializeAfter](#columninitializeafter) | [previewData:updateAfter](#previewdataupdateafter) |
4242
| | |
4343
| **Image Events** | **Other Events** |
@@ -84,7 +84,6 @@ events.on("contentType:mountAfter", function (params) {});
8484
| `id` | `string` |
8585
| `contentType` | `ContentType` |
8686

87-
[Back to top]
8887

8988

9089

@@ -105,7 +104,6 @@ events.on("contentType:mountAfter", function (params) {});
105104
[Back to top]
106105

107106

108-
109107
### `contentType:dropAfter`
110108

111109
```js
@@ -120,7 +118,6 @@ events.on("contentType:dropAfter", function (params) {});
120118
[Back to top]
121119

122120

123-
124121
### `contentType:renderAfter`
125122

126123
```js
@@ -170,7 +167,6 @@ events.on("contentType:duplicateAfter", function (params) {});
170167
[Back to top]
171168

172169

173-
174170
### `contentType:moveBefore`
175171

176172
```js
@@ -188,7 +184,6 @@ events.on("contentType:moveBefore", function (params) {});
188184
[Back to top]
189185

190186

191-
192187
### `contentType:moveAfter`
193188

194189
```js
@@ -206,7 +201,6 @@ events.on("contentType:moveAfter", function (params) {});
206201
[Back to top]
207202

208203

209-
210204
### `contentType:redrawAfter`
211205

212206
```js
@@ -259,7 +253,6 @@ events.on("column:dragStop", function (params) {});
259253
[Back to top]
260254

261255

262-
263256
### `column:initializeAfter`
264257

265258
```js
@@ -305,7 +298,6 @@ events.on("image:mountAfter", function (params) {});
305298
[Back to top]
306299

307300

308-
309301
### `image:uploadAfter`
310302

311303
```js
@@ -361,7 +353,6 @@ events.on("stage:interactionStart", function () {});
361353
[Back to top]
362354

363355

364-
365356
### `stage:interactionStop`
366357

367358
```js
@@ -437,7 +428,6 @@ events.on("childContentType:sortUpdate", function (params) {});
437428
[Back to top]
438429

439430

440-
441431
### `stage:error`
442432

443433
```js
@@ -480,7 +470,6 @@ events.on(`stage:${this.contentType.stageId}:masterFormatRenderAfter`, function
480470
[Back to top]
481471

482472

483-
484473
### `stage:updateAfter`
485474

486475
```js
@@ -522,7 +511,6 @@ events.on("stage:childFocusStop", function () {});
522511
[Back to top]
523512

524513

525-
526514
### `state`
527515

528516
```js
@@ -532,6 +520,7 @@ events.on("state", function (params) {});
532520
| Params | Type |
533521
| ------- | ----------- |
534522
| `state` | `DataStore` |
523+
[Back to top]
535524

536525
### `{{config.name}}:{{preview.contentType.id}}:updateAfter` {#confignameidupdateafter}
537526

@@ -550,7 +539,6 @@ events.on(`${this.config.name}:${this.contentType.id}:updateAfter`, function (pa
550539
[Back to top]
551540

552541

553-
554542
### `googleMaps:authFailure`
555543

556544
```js

docs/release-notes.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
Here are the Page Builder beta release notes and the higher priority known issues. We are actively working on many of these items and will update this document with each beta release.
44

5+
## Beta 7 - February 14, 2019
6+
7+
- Resolved: Content type markup within Text content type causes whole stage to become HTML <!--MC-13917-->
8+
- Resolved: Hard-coded margins on individual Button <!--MC-13925-->
9+
- Resolved: Various TypeScript errors <!--MC-10833-->
10+
- Resolved: Column rearranging drop zone indicators are too small and sometimes hard to activate <!--MC-4262-->
11+
- Resolved: Collect Page Builder content type data for Page Builder analytics <!--MC-1426-->
12+
- Resolved: Improve naming of the critical variables/parameters in the code and configuration <!--MC-5810-->
13+
- Resolved: Text height inconsistency on stage and storefront <!--MC-4254-->
14+
- Resolved: Option menus, Heading inline editor, and tinyMCE inline editor are cut off on full screen view <!--MC-5383-->
15+
- Resolved: Anchor tags for TinyMCE links are not added to the storefront for Banners and Slides (Added notification for when link attribute is entered) <!--MC-5386-->
16+
- Resolved: `WidgetInitializerConfig` only supports <div /> elements <!--MC-13770-->
17+
- Resolved: Slide dots are hard to see against certain backgrounds on storefront <!--MC-5701-->
18+
- Resolved: Missing validation message when uploading big image <!--MC-5184-->
19+
- Resolved: Security issues <!--MC-10871, MC-13922-->
20+
521
## Beta 6 - February 4, 2019
622

723
- Resolved: Background attachments of "fixed" do not work in storefront on Android or iPhone mobile devices<!-- MC-5419 -->

0 commit comments

Comments
 (0)