Merge pull request #1730 from bookernath/optimize-themeSettings-inject

Optimize themeSettings injection

Author: bookernath

assets/js/theme/common/product-details.js

@@ -253,7 +253,7 @@ export default class ProductDetails {
         if (_.isPlainObject(image)) {
             const zoomImageUrl = utils.tools.imageSrcset.getSrcset(
                 image.data,
-                { '1x': this.context.themeSettings.zoom_size },
+                { '1x': this.context.zoomSize },
                 /*
                     Should match zoom size used for data-zoom-image in
                     components/products/product-view.html
@@ -266,7 +266,7 @@ export default class ProductDetails {
 
             const mainImageUrl = utils.tools.imageSrcset.getSrcset(
                 image.data,
-                { '1x': this.context.themeSettings.product_size },
+                { '1x': this.context.productSize },
                 /*
                     Should match fallback image size used for the main product image in
                     components/products/product-view.html

assets/js/theme/global.js

@@ -20,7 +20,7 @@ import objectFitImages from './global/object-fit-polyfill';
 export default class Global extends PageManager {
     onReady() {
         const {
-            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage, themeSettings,
+            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage, showAdminBar,
         } = this.context;
         cartPreview(secureBaseUrl, cartId);
         quickSearch();
@@ -31,7 +31,7 @@ export default class Global extends PageManager {
         menu();
         mobileMenuToggle();
         privacyCookieNotification();
-        if (themeSettings['show-admin-bar']) {
+        if (showAdminBar) {
             adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
         }
         loadingProgressBar();

templates/layout/base.html

@@ -30,7 +30,7 @@
 
         {{{head.scripts}}}
 
-        {{~inject 'themeSettings' theme_settings}}
+        {{~inject 'showAdminBar' theme_settings.show-admin-bar}}
         {{~inject 'genericError' (lang 'common.generic_error')}}
         {{~inject 'maintenanceModeSettings' settings.maintenance}}
         {{~inject 'adminBarLanguage' (langJson 'admin')}}

templates/pages/product.html

@@ -10,6 +10,9 @@
         limit: {{theme_settings.productpage_similar_by_views_count}}
 ---
 {{inject "productId" product.id}}
+{{inject "zoomSize" theme_settings.zoom_size}}
+{{inject "productSize" theme_settings.product_size}}
+
 {{#partial "page"}}
 
     {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}