Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve settings scope passed to components #1435

Merged
merged 2 commits into from
Jan 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

- Ensure SKU and UPC display correctly for Variants on PDP. [#1431](https://github.com/bigcommerce/cornerstone/pull/1431)

- Resolve settings scope passed to components. [#1435](https://github.com/bigcommerce/cornerstone/pull/1435)

## 3.1.1 (2019-01-23)

- Downgrade Webpack to last known good version during development. [#1428](https://github.com/bigcommerce/cornerstone/pull/1428)
Expand Down
4 changes: 2 additions & 2 deletions templates/components/products/new.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2 class="page-heading">{{lang 'products.new' }}</h2>
{{#if settings.data_tag_enabled}}
{{> components/products/carousel settings=../settings products=products list="New Products"}}
{{> components/products/carousel products=products list="New Products"}}
{{else}}
{{> components/products/carousel products=products}}
{{/if}}
{{/if}}
2 changes: 1 addition & 1 deletion templates/components/products/product-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ <h2 class="productView-brand"{{#if schema}} itemprop="brand" itemscope itemtype=
{{#if theme_settings.show_product_details_tabs}}
{{> components/products/description-tabs}}
{{else}}
{{> components/products/description settings=../settings}}
{{> components/products/description}}
{{/if}}
</article>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/components/products/quick-view.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="modal-body quickView">
{{> components/products/product-view settings=../settings schema=false}}
{{> components/products/product-view schema=false}}
</div>
2 changes: 1 addition & 1 deletion templates/components/products/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

{{#if product.similar_by_views}}
<div role="tabpanel" aria-hidden="{{#if product.related_products}}true{{else}}false{{/if}}" class="tab-content has-jsContent{{#unless product.related_products}} is-active{{/unless}}" id="tab-similar">
{{> components/products/carousel settings=../settings products=product.similar_by_views columns=6 list="Customers Also Viewed"}}
{{> components/products/carousel products=product.similar_by_views columns=6 list="Customers Also Viewed"}}

</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/amp/category.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1 class="categoryView-title">
{{/if}}
</main>
{{> components/amp/category/subcategories}}
{{> components/amp/common/footer settings=../settings}}
{{> components/amp/common/footer}}
{{#if settings.amp_analytics_id}}
<amp-analytics type="googleanalytics">
<script type="application/json">
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/amp/product.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{#partial "page"}}
{{> components/amp/common/header }}
<div itemscope itemtype="http://schema.org/Product">
{{> components/amp/products/product-view schema=true settings=../settings}}
{{> components/amp/products/product-view schema=true}}
</div>
{{#if settings.amp_analytics_id}}
<amp-analytics type="googleanalytics">
Expand Down Expand Up @@ -69,6 +69,6 @@
</script>
</amp-analytics>
{{/if}}
{{> components/amp/common/footer settings=../settings}}
{{> components/amp/common/footer}}
{{/partial}}
{{> layout/amp }}
2 changes: 1 addition & 1 deletion templates/pages/brand.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="page-heading">{{brand.name}}</h1>

<main class="page-content" id="product-listing-container">
{{#if brand.products}}
{{> components/brand/product-listing settings=../settings}}
{{> components/brand/product-listing}}
{{else}}
<p>{{lang 'brands.no_products'}}</p>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/category.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h1 class="page-heading">{{category.name}}</h1>

<main class="page-content" id="product-listing-container">
{{#if category.products}}
{{> components/category/product-listing settings=../settings}}
{{> components/category/product-listing}}
{{else}}
<p>{{lang 'categories.no_products'}}</p>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/product.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{/each}}

<div itemscope itemtype="http://schema.org/Product">
{{> components/products/product-view settings=../settings schema=true }}
{{> components/products/product-view schema=true }}

{{#if product.videos.list.length}}
{{> components/products/videos product.videos}}
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h5 class="suggestion-title">{{lang 'forms.search.suggestions.title'}}</h5>
{{/if}}

<div id="product-listing-container" {{#if forms.search.section '!=' 'product'}}class="u-hiddenVisually"{{/if}}>
{{> components/search/product-listing settings=../settings}}
{{> components/search/product-listing}}
</div>
</main>
</section>
Expand Down