Merge branch 'master' into BCTHEME-958

bigcommerce · Dec 6, 2021 · 759b63c · 759b63c
2 parents 2ecdf75 + dc89704
commit 759b63c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Draft
 - Translation updates November 2021. [#2146](https://github.com/bigcommerce/cornerstone/pull/2146)
+- Admin Bar displays regardless of setting. [#2144](https://github.com/bigcommerce/cornerstone/pull/2144)
 
 ## 6.1.3 (11-10-2021)
 - Cannot see currency dropdown in storefront. [#2141](https://github.com/bigcommerce/cornerstone/pull/2141)

diff --git a/assets/js/theme/global.js b/assets/js/theme/global.js
@@ -19,7 +19,7 @@ import svgInjector from './global/svg-injector';
 export default class Global extends PageManager {
     onReady() {
         const {
-            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage, showAdminBar,
+            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage,
         } = this.context;
         cartPreview(secureBaseUrl, cartId);
         quickSearch();
@@ -30,9 +30,7 @@ export default class Global extends PageManager {
         menu();
         mobileMenuToggle();
         privacyCookieNotification();
-        if (showAdminBar) {
-            adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
-        }
+        adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
         loadingProgressBar();
         svgInjector();
     }

diff --git a/config.json b/config.json
@@ -348,7 +348,6 @@
       "paypal"
     ],
     "lazyload_mode": "lazyload+lqip",
-    "show-admin-bar": true,
     "checkout-paymentbuttons-paypal-color": "black",
     "checkout-paymentbuttons-paypal-shape": "rect",
     "checkout-paymentbuttons-paypal-size": "large",

diff --git a/schema.json b/schema.json
@@ -516,15 +516,6 @@
         "type": "color",
         "label": "i18n.FieldBorderActive",
         "id": "input-border-color-active"
-      },
-      {
-        "type": "heading",
-        "content": "i18n.AdminBar"
-      },
-      {
-        "type": "checkbox",
-        "label": "i18n.ShowAdminBar",
-        "id": "show-admin-bar"
       }
     ]
   },

diff --git a/templates/layout/base.html b/templates/layout/base.html
@@ -44,7 +44,6 @@
 
         {{~inject 'zoomSize' theme_settings.zoom_size}}
         {{~inject 'productSize' theme_settings.product_size}}
-        {{~inject 'showAdminBar' theme_settings.show-admin-bar}}
         {{~inject 'genericError' (lang 'common.generic_error')}}
         {{~inject 'maintenanceModeSettings' settings.maintenance}}
         {{~inject 'adminBarLanguage' (langJson 'admin')}}