Skip to content

Commit 2f6e989

Browse files
jissereitsmajissereitsma
committed
Merge branch 'master' of github.com:LokiExtensions/LokiTheme_LumaComponents
2 parents 7c992fb + d44d61b commit 2f6e989

4 files changed

Lines changed: 57 additions & 24 deletions

File tree

‎view/frontend/layout/loki_theme_catalog_category_view.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0"?>
22
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
33
<body>
4-
<referenceContainer name="before.body.end">
5-
<block name="loki.script.component.category.addtocart" template="LokiTheme_LumaComponents::script/component/category/add-to-cart.phtml"/>
6-
<block name="loki.script.component.category.layered-navigation" template="LokiTheme_LumaComponents::script/component/category/layered-navigation.phtml"/>
7-
<block name="loki.script.component.category.add-to-wishlist" template="LokiTheme_LumaComponents::script/component/category/add-to-wishlist.phtml"/>
8-
<block name="loki.script.component.category.add-to-compare" template="LokiTheme_LumaComponents::script/component/category/add-to-compare.phtml"/>
4+
<referenceContainer name="loki.script.component">
5+
<block
6+
name="loki.script.component.category.addtocart"
7+
template="LokiTheme_LumaComponents::script/component/category/add-to-cart.phtml"/>
8+
<block
9+
name="loki.script.component.category.layered-navigation"
10+
template="LokiTheme_LumaComponents::script/component/category/layered-navigation.phtml"/>
11+
<block
12+
name="loki.script.component.category.add-to-wishlist"
13+
template="LokiTheme_LumaComponents::script/component/category/add-to-wishlist.phtml"/>
14+
<block
15+
name="loki.script.component.category.add-to-compare"
16+
template="LokiTheme_LumaComponents::script/component/category/add-to-compare.phtml"/>
917
</referenceContainer>
1018
</body>
1119
</page>

‎view/frontend/layout/loki_theme_catalog_product_view.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0"?>
22
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
33
<body>
4-
<referenceContainer name="before.body.end">
5-
<block name="loki.script.component.product.addtocart" template="LokiTheme_LumaComponents::script/component/product/addtocart.phtml"/>
6-
<block name="loki.script.component.tabs" template="LokiTheme_LumaComponents::script/component/tabs.phtml"/>
4+
<referenceContainer name="loki.script.component">
5+
<block
6+
name="loki.script.component.product.addtocart"
7+
template="LokiTheme_LumaComponents::script/component/product/addtocart.phtml"/>
8+
<block
9+
name="loki.script.component.tabs"
10+
template="LokiTheme_LumaComponents::script/component/tabs.phtml"/>
711
</referenceContainer>
812
</body>
913
</page>

‎view/frontend/layout/loki_theme_default.xml‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,48 @@
11
<?xml version="1.0"?>
2-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
2+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
34
<update handle="loki_base"/>
45

56
<body>
67
<referenceContainer name="loki.script">
7-
<block name="loki.script.function.toggle" template="LokiTheme_LumaComponents::script/function/toggle.phtml"/>
8-
<block name="loki.script.function.tabs" template="LokiTheme_LumaComponents::script/function/tabs.phtml"/>
9-
<block name="loki.script.function.data-post" template="LokiTheme_LumaComponents::script/function/data-post.phtml"/>
8+
<block name="loki.script.function.toggle"
9+
template="LokiTheme_LumaComponents::script/function/toggle.phtml"/>
10+
<block name="loki.script.function.tabs"
11+
template="LokiTheme_LumaComponents::script/function/tabs.phtml"/>
12+
<block name="loki.script.function.data-post"
13+
template="LokiTheme_LumaComponents::script/function/data-post.phtml"/>
1014
</referenceContainer>
1115

1216
<referenceContainer name="loki.script.component-type">
1317
<block name="loki.script.component.minicart-content" template="LokiTheme_LumaComponents::script/component-type/minicart-component-type.phtml"/>
1418
</referenceContainer>
1519

1620
<referenceContainer name="loki.script.component">
17-
<block name="loki.script.component.dropdown" template="LokiTheme_LumaComponents::script/component/dropdown.phtml"/>
18-
<block name="loki.script.component.main-menu" template="LokiTheme_LumaComponents::script/component/main-menu.phtml"/>
19-
<block name="loki.script.component.mobile-menu" template="LokiTheme_LumaComponents::script/component/mobile-menu.phtml"/>
20-
<block name="loki.script.component.newsletter" template="LokiTheme_LumaComponents::script/component/newsletter.phtml"/>
21-
<block name="loki.script.component.minicart-content" template="LokiTheme_LumaComponents::script/component/minicart-content.phtml"/>
22-
<block name="loki.script.component.top-links" template="LokiTheme_LumaComponents::script/component/top-links.phtml"/>
23-
<block name="loki.script.component.currency-switcher" template="LokiTheme_LumaComponents::script/component/currency-switcher.phtml"/>
24-
<block ifconfig="web/cookie/cookie_restriction" name="loki.script.component.cookie-notice" template="LokiTheme_LumaComponents::script/component/cookie-notice.phtml"/>
21+
<block
22+
name="loki.script.component.dropdown"
23+
template="LokiTheme_LumaComponents::script/component/dropdown.phtml"/>
24+
<block
25+
name="loki.script.component.main-menu"
26+
template="LokiTheme_LumaComponents::script/component/main-menu.phtml"/>
27+
<block
28+
name="loki.script.component.mobile-menu"
29+
template="LokiTheme_LumaComponents::script/component/mobile-menu.phtml"/>
30+
<block
31+
name="loki.script.component.newsletter"
32+
template="LokiTheme_LumaComponents::script/component/newsletter.phtml"/>
33+
<block
34+
name="loki.script.component.minicart-content"
35+
template="LokiTheme_LumaComponents::script/component/minicart-content.phtml"/>
36+
<block
37+
name="loki.script.component.top-links"
38+
template="LokiTheme_LumaComponents::script/component/top-links.phtml"/>
39+
<block
40+
name="loki.script.component.currency-switcher"
41+
template="LokiTheme_LumaComponents::script/component/currency-switcher.phtml"/>
42+
<block
43+
ifconfig="web/cookie/cookie_restriction"
44+
name="loki.script.component.cookie-notice"
45+
template="LokiTheme_LumaComponents::script/component/cookie-notice.phtml"/>
2546
</referenceContainer>
2647

2748
<referenceContainer name="minicart.addons">

‎view/frontend/templates/component/minicart-content.phtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $loaderImage = $block->getViewFileUrl('images/loader-2.gif');
1515
type="button"
1616
id="btn-minicart-close"
1717
class="action close"
18-
@click="closeContent"
18+
@click.prevent="closeContent"
1919
title="Close">
2020
<span>Close</span>
2121
</button>
@@ -63,7 +63,7 @@ $loaderImage = $block->getViewFileUrl('images/loader-2.gif');
6363
<div class="primary">
6464
<button id="top-cart-btn-checkout" type="button"
6565
class="action primary checkout"
66-
@click="proceedToCheckout"
66+
@click.prevent="proceedToCheckout"
6767
title="<?= $escaper->escapeHtml(
6868
__('Proceed to Checkout')
6969
) ?>"
@@ -135,7 +135,7 @@ $loaderImage = $block->getViewFileUrl('images/loader-2.gif');
135135
<button class="update-cart-item"
136136
:data-cart-item-id="item.item_id"
137137
style="display:none"
138-
@click="updateCartItemQty"
138+
@click.prevent="updateCartItemQty"
139139
title="<?= $escaper->escapeHtml(
140140
__('Update')
141141
) ?>">
@@ -160,7 +160,7 @@ $loaderImage = $block->getViewFileUrl('images/loader-2.gif');
160160
</a>
161161
</div>
162162
<div class="secondary">
163-
<a @click="removeCartItem"
163+
<a @click.prevent="removeCartItem"
164164
class="action delete"
165165
:data-cart-item="item.item_id"
166166
title="<?= $escaper->escapeHtml(

0 commit comments

Comments
 (0)