Skip to content

Commit c587bcc

Browse files
vpelipenkovpelipenko
committed
Merge pull request #104 from magento-vanilla/PR
[Vanilla] Sprint 13
2 parents 1faf79c + 5a16dd2 commit c587bcc

File tree

50 files changed

+952
-646
lines changed

Some content is hidden

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

50 files changed

+952
-646
lines changed

‎app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ $product = $block->getSaleableItem();
8282
<?php endforeach; ?>
8383
</ul>
8484
<?php if ($msrpShowOnGesture):?>
85-
<script>
86-
require(["jquery", "mage/mage"], function($){
87-
88-
$('.product-info-main').mage('tierPrice', {
89-
inputQty: '#qty',
90-
productForm: '#product_addtocart_form'
91-
});
92-
93-
});
94-
</script>
85+
<script type="text/x-magento-init">
86+
{
87+
".product-info-main": {
88+
"tierPrice": {
89+
"inputQty": "#qty",
90+
"productForm": "#product_addtocart_form"
91+
}
92+
}
93+
}
94+
</script>
9595
<?php endif;?>
9696
<?php endif; ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,20 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
1717
<div class="product-addto-links" data-role="add-to-links">
1818
<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
1919
<a href="#"
20-
class="action towishlist"
21-
title="<?php echo __('Add to Wishlist') ?>"
22-
data-post='<?php echo $_wishlistSubmitParams; ?>'
23-
data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
20+
class="action towishlist"
21+
title="<?php echo __('Add to Wishlist') ?>"
22+
data-post='<?php echo $_wishlistSubmitParams; ?>'
23+
data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
2424
<?php endif; ?>
2525
<a href="#" data-post='<?php echo $compareHelper->getPostDataParams($_product);?>'
26-
data-role="add-to-links"
27-
title="<?php echo __('Add to Compare') ?>"
28-
class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
26+
data-role="add-to-links"
27+
title="<?php echo __('Add to Compare') ?>"
28+
class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
2929
</div>
30-
<script>
31-
require([
32-
"jquery",
33-
"mage/mage"
34-
], function(jQuery){
35-
jQuery('body').mage('addToWishlist',
36-
<?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
37-
);
38-
});
30+
<script type="text/x-magento-init">
31+
{
32+
"body": {
33+
"addToWishlist": <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
34+
}
35+
}
3936
</script>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,32 +43,38 @@
4343
</fieldset>
4444
</div>
4545
<?php endif; ?>
46+
<?php if ($block->isRedirectToCartEnabled()) : ?>
47+
<script type="text/x-magento-init">
48+
{
49+
"#product_addtocart_form": {
50+
"Magento_Catalog/product/view/validation": {
51+
"radioCheckboxClosest": ".nested"
52+
}
53+
}
54+
}
55+
</script>
56+
<?php else : ?>
4657
<script>
47-
<?php if ($block->isRedirectToCartEnabled()) : ?>
48-
require([
49-
"jquery",
50-
"mage/mage",
51-
"Magento_Catalog/product/view/validation"
52-
], function($){
53-
$('#product_addtocart_form').mage('validation', {
54-
radioCheckboxClosest: '.nested'
55-
});
56-
});
57-
<?php else : ?>
58-
require([
59-
"jquery",
60-
"mage/mage",
61-
"Magento_Catalog/product/view/validation",
62-
"Magento_Catalog/js/catalog-add-to-cart"
63-
], function($){
64-
$('#product_addtocart_form').mage('validation', {
65-
radioCheckboxClosest: '.nested',
66-
submitHandler: function(form) {
67-
var widget = $(form).catalogAddToCart({bindSubmit: false});
68-
widget.catalogAddToCart('submitForm', $(form));
69-
return false;
70-
}
71-
});
58+
require([
59+
'jquery',
60+
'mage/mage',
61+
'Magento_Catalog/product/view/validation',
62+
'Magento_Catalog/js/catalog-add-to-cart'
63+
], function ($) {
64+
'use strict';
65+
66+
$('#product_addtocart_form').mage('validation', {
67+
radioCheckboxClosest: '.nested',
68+
submitHandler: function (form) {
69+
var widget = $(form).catalogAddToCart({
70+
bindSubmit: false
71+
});
72+
73+
widget.catalogAddToCart('submitForm', $(form));
74+
75+
return false;
76+
}
7277
});
73-
<?php endif; ?>
78+
});
7479
</script>
80+
<?php endif; ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/base-image.phtml

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -138,40 +138,39 @@ $thumbHeight = $block->getVar("product_page_more_views:height") ?: $thumbWidth;
138138
<script data-template="notice" type="text/x-magento-template">
139139
<p class="notice" data-role="notice"><%= data.text %></p>
140140
</script>
141-
<script>
142-
require(["jquery", "mage/mage"], function($){
143-
144-
$('[data-role=media-gallery]')
145-
.mage('gallery', {
146-
sizes: {
147-
small: {
148-
width: <?php echo $thumbWidth ?>,
149-
height: <?php echo $thumbHeight ?>
141+
<script type="text/x-magento-init">
142+
{
143+
"[data-role=media-gallery]": {
144+
"gallery": {
145+
"sizes": {
146+
"small": {
147+
"width": <?php echo $thumbWidth ?>,
148+
"height": <?php echo $thumbHeight ?>
150149
},
151-
medium: {
152-
width: <?php echo $_resizedWidth ?>,
153-
height: <?php echo $_resizedHeight ?>
150+
"medium": {
151+
"width": <?php echo $_resizedWidth ?>,
152+
"height": <?php echo $_resizedHeight ?>
154153
}
155154
},
156-
controls: {
157-
notice: {
158-
text: '<?php echo $block->escapeJsQuote(__("Click on image to view it full sized")) ?>'
155+
"controls": {
156+
"notice": {
157+
"text": "<?php echo $block->escapeJsQuote(__('Click on image to view it full sized')) ?>"
159158
}
160159
}
161-
})
162-
.mage('zoom', {
163-
controls: {
164-
display: {
165-
left: 20,
166-
top: 65
160+
},
161+
"zoom": {
162+
"controls": {
163+
"display": {
164+
"left": 20,
165+
"top": 65
167166
},
168-
notice: {
169-
text: '<?php echo $block->escapeJsQuote(__("Click on image to zoom")) ?>'
167+
"notice": {
168+
"text": "<?php echo $block->escapeJsQuote(__('Click on image to zoom')) ?>"
170169
}
171170
}
172-
})
173-
.mage('galleryFullScreen', {});
174-
175-
});
176-
</script>
171+
},
172+
"galleryFullScreen": {}
173+
}
174+
}
175+
</script>
177176
<?php endif; ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111

1212
<?php $_options = $block->decorateArray($block->getOptions()) ?>
1313
<?php if (count($_options)):?>
14-
<script>
15-
require([ 'jquery', 'Magento_Catalog/js/price-options' ], function($){
16-
$('#product_addtocart_form')
17-
.priceOptions({
18-
'optionConfig':<?php echo $block->getJsonConfig()?>,
19-
'controlContainer': '.field',
20-
'priceHolderSelector': '[data-role=priceBox]'
21-
});
22-
});
14+
<script type="text/x-magento-init">
15+
{
16+
"#product_addtocart_form": {
17+
"priceOptions": {
18+
"optionConfig": <?php echo $block->getJsonConfig()?>,
19+
"controlContainer": ".field",
20+
"priceHolderSelector": "[data-role=priceBox]"
21+
}
22+
}
23+
}
2324
</script>
2425
<?php foreach ($_options as $_option): ?>
2526
<?php echo $block->getOptionHtml($_option) ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options/js.phtml

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<?php $_optionId = $_option->getId() ?>
1212
<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
1313
<div class="field date<?php echo $class; ?>"
14-
data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
14+
data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
1515
<label class="label">
1616
<span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
1717
<?php echo $block->getFormatedPrice() ?>
@@ -31,26 +31,25 @@
3131

3232
<?php if ($_option->getIsRequire()): ?>
3333
<input type="hidden"
34-
name="validate_datetime_<?php echo $_optionId ?>"
35-
class="validate-datetime-<?php echo $_optionId ?>"
36-
value=""
37-
data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
34+
name="validate_datetime_<?php echo $_optionId ?>"
35+
class="validate-datetime-<?php echo $_optionId ?>"
36+
value=""
37+
data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
3838
<?php else: ?>
3939
<input type="hidden"
40-
name="validate_datetime_<?php echo $_optionId ?>"
41-
class="validate-datetime-<?php echo $_optionId ?>"
42-
value=""
43-
data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
40+
name="validate_datetime_<?php echo $_optionId ?>"
41+
class="validate-datetime-<?php echo $_optionId ?>"
42+
value=""
43+
data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
4444
<?php endif; ?>
45-
<script>
46-
require([
47-
'jquery',
48-
'mage/mage'
49-
], function($){
50-
$('#product_addtocart_form').mage('validation', {
51-
ignore: ':hidden:not(input[name^="validate_datetime_"])'
52-
});
53-
});
54-
</script>
45+
<script type="text/x-magento-init">
46+
{
47+
"#product_addtocart_form": {
48+
"validation": {
49+
"ignore": ":hidden:not(input[name^='validate_datetime_'])"
50+
}
51+
}
52+
}
53+
</script>
5554
</div>
5655
</div>

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,15 @@
3232
</div>
3333
</fieldset>
3434
</div>
35-
36-
<script>
37-
require([
38-
"jquery",
39-
"mage/mage"
40-
], function($){
41-
42-
var addtocartForm = $('#product_addtocart_form');
43-
addtocartForm.mage('validation');
44-
addtocartForm.mage('addToCart', {
45-
cartButtonId: "#product-updatecart-button",
46-
cartForm: "#product_addtocart_form"
47-
});
48-
49-
});
50-
</script>
35+
<script type="text/x-magento-init">
36+
{
37+
"#product_addtocart_form": {
38+
"validation": {},
39+
"addToCart": {
40+
"cartButtonId": "#product-updatecart-button",
41+
"cartForm": "#product_addtocart_form"
42+
}
43+
}
44+
}
45+
</script>
5146
<?php endif; ?>

0 commit comments

Comments
 (0)