Skip to content

Commit 3d52d90

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'remotes/mainline/1.0.1-release' into MC-15970
2 parents c39bac9 + fcde990 commit 3d52d90

File tree

199 files changed

+46
-12683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+46
-12683
lines changed

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
10-
"magento/framework": "*",
10+
"magento/framework": "~102.0.1",
1111
"php": "~7.1.3||~7.2.0"
1212
},
1313
"type": "magento2-module",

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
10-
"magento/framework": "*",
10+
"magento/framework": "~102.0.1",
1111
"php": "~7.1.3||~7.2.0"
1212
},
1313
"type": "magento2-module",

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
<!-- Location Pin Configuration -->
2020
<element name="latitude" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-locations,'&quot;position&quot;:{&quot;latitude&quot;:{{arg2}},')]" parameterized="true"/>
2121
<element name="longitude" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-locations,',&quot;longitude&quot;:{{arg2}}}')]" parameterized="true"/>
22-
<element name="tooltipWindow" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']" parameterized="true"/>
23-
<element name="tooltipWindowClose" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//..//button[@title='Close']" parameterized="true"/>
24-
<element name="locationName" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//h3/b[.='{{arg2}}']" parameterized="true"/>
25-
<element name="comment" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//p[.='{{arg2}}']" parameterized="true"/>
26-
<element name="phoneNumber" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//p[.='Phone: {{arg2}}']" parameterized="true"/>
27-
<element name="noPhoneNumber" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//p[.='{{arg2}}']" parameterized="true"/>
28-
<element name="addressCityStateZipCountry" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
29-
<element name="locationNameElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//h3/b" parameterized="true"/>
30-
<element name="commentElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//p" parameterized="true"/>
31-
<element name="phoneNumberElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//p" parameterized="true"/>
32-
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//span" parameterized="true"/>
22+
<element name="tooltipWindow" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]" parameterized="true"/>
23+
<element name="tooltipWindowClose" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//..//button[@title='Close']" parameterized="true"/>
24+
<element name="locationName" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//h3/b[.='{{arg2}}']" parameterized="true"/>
25+
<element name="comment" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='{{arg2}}']" parameterized="true"/>
26+
<element name="phoneNumber" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='Phone: {{arg2}}']" parameterized="true"/>
27+
<element name="noPhoneNumber" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='{{arg2}}']" parameterized="true"/>
28+
<element name="addressCityStateZipCountry" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
29+
<element name="locationNameElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//h3/b" parameterized="true"/>
30+
<element name="commentElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
31+
<element name="phoneNumberElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
32+
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span" parameterized="true"/>
3333
<!-- Map Settings Configuration -->
3434
<element name="height" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
3535
<element name="noHeight" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and not(contains(@style,'height:'))]" parameterized="true"/>
@@ -68,17 +68,17 @@
6868
<!-- Location Pin Configuration -->
6969
<element name="latitude" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}][contains(@data-locations,'&quot;position&quot;:{&quot;latitude&quot;:{{arg2}},')]" parameterized="true"/>
7070
<element name="longitude" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}][contains(@data-locations,',&quot;longitude&quot;:{{arg2}}}')]" parameterized="true"/>
71-
<element name="tooltipWindow" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']" parameterized="true"/>
72-
<element name="tooltipWindowClose" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//..//button[@title='Close']" parameterized="true"/>
73-
<element name="locationName" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//h3/b[.='{{arg2}}']" parameterized="true"/>
74-
<element name="comment" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//p[.='{{arg2}}']" parameterized="true"/>
75-
<element name="phoneNumber" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//p[.='Phone: {{arg2}}']" parameterized="true"/>
76-
<element name="noPhoneNumber" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//p[.='{{arg2}}']" parameterized="true"/>
77-
<element name="addressCityStateZipCountry" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
78-
<element name="locationNameElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//h3/b" parameterized="true"/>
79-
<element name="commentElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//p" parameterized="true"/>
80-
<element name="phoneNumberElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//p" parameterized="true"/>
81-
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[@class='gm-style-iw']//span" parameterized="true"/>
71+
<element name="tooltipWindow" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]" parameterized="true"/>
72+
<element name="tooltipWindowClose" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//..//button[@title='Close']" parameterized="true"/>
73+
<element name="locationName" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//h3/b[.='{{arg2}}']" parameterized="true"/>
74+
<element name="comment" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='{{arg2}}']" parameterized="true"/>
75+
<element name="phoneNumber" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='Phone: {{arg2}}']" parameterized="true"/>
76+
<element name="noPhoneNumber" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p[.='{{arg2}}']" parameterized="true"/>
77+
<element name="addressCityStateZipCountry" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
78+
<element name="locationNameElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//h3/b" parameterized="true"/>
79+
<element name="commentElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
80+
<element name="phoneNumberElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
81+
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span" parameterized="true"/>
8282
<!-- Map Settings Configuration -->
8383
<element name="height" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}][contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
8484
<element name="noHeight" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}][not(contains(@style,'height:'))]" parameterized="true"/>
@@ -122,7 +122,7 @@
122122
<element name="clickablePin" type="button" selector="//div[@data-index='position']//div[@class='map-field']//map//area"/>
123123
<element name="allPins" type="button" selector="//div[@data-index='position']//div[@class='map-field']//img[not(@usemap) and contains(@src,'spotlight-poi2_hdpi.png')]|//div[@data-index='position']//div[@class='map-field']//img[not(@usemap) and contains(@src,'spotlight-poi2.png')]"/>
124124
<element name="pinLocations" type="text" selector="(//div[@data-index='position']//div[contains(@style,'transform: matrix(1, 0, 0, 1, ')])[{{arg1}}]" parameterized="true"/>
125-
<element name="tooltipWindow" type="text" selector="//div[@data-index='position']//div[@class='map-field']//div[@class='gm-style-iw']"/>
125+
<element name="tooltipWindow" type="text" selector="//div[@data-index='position']//div[@class='map-field']//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]"/>
126126
<element name="helperText" type="button" selector="//div[@data-index='position']//span[.='You can move the pin by clicking or dragging it where you want. To alter the zoom please use the controls.']"/>
127127
<element name="renderedMap" type="button" selector="//div[@data-index='position']//div[@class='map-field']//div[contains(@class, 'gm-style')]"/>
128128
<element name="googleMapsLink" type="button" selector="//div[@data-index='position']//div[@class='map-field' and not(contains(@style,'display: none;'))]//a//img[{{arg1}}]" parameterized="true"/>

‎app/code/Magento/PageBuilder/composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"name": "magento/module-page-builder",
33
"description": "Page Builder module",
44
"require": {
5-
"magento/framework": "*",
5+
"magento/framework": "~102.0.1",
66
"magento/module-eav": "*",
7-
"magento/module-search": "*",
8-
"magento/module-store": "*",
9-
"magento/module-backend": "*",
7+
"magento/module-search": "~101.0.1",
8+
"magento/module-store": "~101.0.1",
9+
"magento/module-backend": "~101.0.1",
1010
"magento/module-cms": "*",
1111
"magento/module-catalog": "*",
12-
"magento/module-config": "*",
12+
"magento/module-config": "~101.1.1",
1313
"magento/module-ui": "*",
1414
"magento/module-widget": "*",
1515
"magento/module-catalog-widget": "*",
16-
"magento/module-rule": "*",
17-
"magento/module-directory": "*",
16+
"magento/module-rule": "~100.3.1",
17+
"magento/module-directory": "~100.3.1",
1818
"php": "~7.1.3||~7.2.0"
1919
},
2020
"conflict": {

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/nesting-link-dialog.js

Lines changed: 1 addition & 1 deletion
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/utils/nesting-link-dialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function nestingLinkDialog(
2828
const dataStoreContent = dataStore.getState() as DataObject;
2929
const inlineMessage = dataStoreContent[inlineMessageField] as string;
3030
const linkUrl = dataStoreContent[linkUrlField] as FieldDefaultsInterface;
31-
const aLinkRegex = /<a[\s]+([^>]+)>|<a>|<\/a>/igm;
31+
const aLinkRegex = /(<a[\s]+[^>]+).+(?=<\/a>)<\/a>/igm;
3232
if (wysiwyg &&
3333
inlineMessage.match(aLinkRegex) &&
3434
linkUrl &&

‎app/code/Magento/PageBuilderAnalytics/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "magento/module-page-builder-analytics",
33
"description": "Page Builder Analytics module",
44
"require": {
5-
"magento/module-analytics": "*",
5+
"magento/module-analytics": "~100.3.1",
66
"magento/module-page-builder": "*",
7-
"magento/framework": "*",
7+
"magento/framework": "~102.0.1",
88
"php": "~7.1.3||~7.2.0"
99
},
1010
"type": "magento2-module",

0 commit comments

Comments
 (0)