diff --git a/CHANGELOG.md b/CHANGELOG.md index 38ee299370..b24f2d841e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Replace JavaScript alert/confirmations with sweetalert2 library [#1035](https://github.com/bigcommerce/cornerstone/pull/1035) - Add global Sass variables to easily toggle exposure of Foundation styles from Citadel [#1047](https://github.com/bigcommerce/cornerstone/pull/1047) - Fix google plus social icon position [#1048](https://github.com/bigcommerce/cornerstone/pull/1048) +- Use `page_type` instead of `template` for routing. Fix an issue with javascript not running in custom templates [#1047](https://github.com/bigcommerce/cornerstone/pull/1050) ## 1.9.0 (2017-07-18) - Product Images were obscuring product details on smaller viewports [#1019](https://github.com/bigcommerce/cornerstone/pull/1019) @@ -15,7 +16,7 @@ - Add on/off toggle to the theme editor for the "Shop by Price" panel located on category pages [#1036](https://github.com/bigcommerce/cornerstone/pull/1036) - Fix H1-H6 font-sizing [#1034](https://github.com/bigcommerce/cornerstone/pull/1034) - Reduce theme bundle size by using specific minified libraries [#1037](https://github.com/bigcommerce/cornerstone/pull/1037) -- Fix google plus spacing issue [#1041](https://github.com/bigcommerce/cornerstone/pull/1041) +- Fix google plus spacing issue [#1041](https://github.com/bigcommerce/cornerstone/pull/1041) ## 1.8.2 (2017-06-23) - Swaps `writeReview` for `write_review` to fix email link issue [#1017](https://github.com/bigcommerce/cornerstone/pull/1017) diff --git a/assets/js/app.js b/assets/js/app.js index 09ddaae976..afae3b04ec 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -7,58 +7,56 @@ import Global from './theme/global'; const getAccount = () => import('./theme/account'); const getLogin = () => import('./theme/auth'); const pageClasses = { - 'pages/account/orders/all': getAccount, - 'pages/account/orders/details': getAccount, - 'pages/account/addresses': getAccount, - 'pages/account/add-address': getAccount, - 'pages/account/add-return': getAccount, - 'pages/account/add-wishlist': () => import('./theme/wishlist'), - 'pages/account/recent-items': getAccount, - 'pages/account/download-item': getAccount, - 'pages/account/edit': getAccount, - 'pages/account/inbox': getAccount, - 'pages/account/return-saved': getAccount, - 'pages/account/returns': getAccount, - 'pages/auth/login': getLogin, - 'pages/auth/account-created': getLogin, - 'pages/auth/create-account': getLogin, - 'pages/auth/new-password': getLogin, - 'pages/auth/forgot-password': getLogin, - 'pages/blog': () => import('./theme/blog'), - 'pages/blog-post': () => import('./theme/blog'), - 'pages/brand': () => import('./theme/brand'), - 'pages/brands': () => import('./theme/brand'), - 'pages/cart': () => import('./theme/cart'), - 'pages/category': () => import('./theme/category'), - 'pages/compare': () => import('./theme/compare'), - 'pages/contact-us': () => import('./theme/contact-us'), - 'pages/errors': () => import('./theme/errors'), - 'pages/errors/404': () => import('./theme/404-error'), - 'pages/gift-certificate/purchase': () => import('./theme/gift-certificate'), - 'pages/gift-certificate/balance': () => import('./theme/gift-certificate'), - 'pages/gift-certificate/redeem': () => import('./theme/gift-certificate'), - 'pages/home': () => import('./theme/home'), - 'pages/order-complete': () => import('./theme/order-complete'), - 'pages/page': () => import('./theme/page'), - 'pages/product': () => import('./theme/product'), - 'pages/amp/product-options': () => import('./theme/product'), - 'pages/search': () => import('./theme/search'), - 'pages/rss': () => import('./theme/rss'), - 'pages/sitemap': () => import('./theme/sitemap'), - 'pages/subscribed': () => import('./theme/subscribe'), - 'pages/account/wishlist-details': () => import('./theme/wishlist'), - 'pages/account/wishlists': () => import('./theme/wishlist'), + account_orderstatus: getAccount, + account_order: getAccount, + account_addressbook: getAccount, + shippingaddressform: getAccount, + account_new_return: getAccount, + 'add-wishlist': () => import('./theme/wishlist'), + account_recentitems: getAccount, + account_downloaditem: getAccount, + editaccount: getAccount, + account_inbox: getAccount, + account_saved_return: getAccount, + account_returns: getAccount, + login: getLogin, + createaccount_thanks: getLogin, + createaccount: getLogin, + getnewpassword: getLogin, + forgotpassword: getLogin, + blog: () => import('./theme/blog'), + blog_post: () => import('./theme/blog'), + brand: () => import('./theme/brand'), + brands: () => import('./theme/brand'), + cart: () => import('./theme/cart'), + category: () => import('./theme/category'), + compare: () => import('./theme/compare'), + page_contact_form: () => import('./theme/contact-us'), + error: () => import('./theme/errors'), + 404: () => import('./theme/404-error'), + giftcertificates: () => import('./theme/gift-certificate'), + giftcertificates_balance: () => import('./theme/gift-certificate'), + giftcertificates_redeem: () => import('./theme/gift-certificate'), + default: () => import('./theme/home'), + page: () => import('./theme/page'), + product: () => import('./theme/product'), + amp_product_options: () => import('./theme/product'), + search: () => import('./theme/search'), + rss: () => import('./theme/rss'), + sitemap: () => import('./theme/sitemap'), + newsletter_subscribe: () => import('./theme/subscribe'), + wishlist: () => import('./theme/wishlist'), + wishlists: () => import('./theme/wishlist'), }; /** * This function gets added to the global window and then called * on page load with the current template loaded and JS Context passed in - * @todo use page_type instead of template_file (STENCIL-2922) - * @param templateFile String + * @param pageType String * @param contextJSON * @returns {*} */ -window.stencilBootstrap = function stencilBootstrap(templateFile, contextJSON = null, loadGlobal = true) { +window.stencilBootstrap = function stencilBootstrap(pageType, contextJSON = null, loadGlobal = true) { const context = JSON.parse(contextJSON || {}); return { @@ -69,7 +67,7 @@ window.stencilBootstrap = function stencilBootstrap(templateFile, contextJSON = let PageClass; // Finds the appropriate class from the pageType. - const pageClassImporter = pageClasses[templateFile]; + const pageClassImporter = pageClasses[pageType]; if (typeof pageClassImporter === 'function') { PageClass = (await pageClassImporter()).default; } diff --git a/assets/js/theme/order-complete.js b/assets/js/theme/order-complete.js deleted file mode 100644 index 9023760c9e..0000000000 --- a/assets/js/theme/order-complete.js +++ /dev/null @@ -1,3 +0,0 @@ -import PageManager from './page-manager'; - -export default class OrderComplete extends PageManager {} diff --git a/templates/components/common/header.html b/templates/components/common/header.html index a85ea3c8c6..2ab0502b16 100644 --- a/templates/components/common/header.html +++ b/templates/components/common/header.html @@ -11,7 +11,7 @@ {{> components/common/navigation}} - {{#if template '===' 'pages/home'}} + {{#if page_type '===' 'default'}}

{{> components/common/store-logo}}

diff --git a/templates/layout/amp-iframe.html b/templates/layout/amp-iframe.html index f227f559b8..665c57f6d0 100644 --- a/templates/layout/amp-iframe.html +++ b/templates/layout/amp-iframe.html @@ -29,7 +29,7 @@ {{{footer.scripts}}} diff --git a/templates/pages/order-complete.html b/templates/pages/order-complete.html deleted file mode 100644 index ed958cb571..0000000000 --- a/templates/pages/order-complete.html +++ /dev/null @@ -1,7 +0,0 @@ -{{#partial "page"}} -
-

Order Complete

-

Your order is complete. How awesome is that!

-
-{{/partial}} -{{> layout/base}}