${this.renderIcons()} ${this.badge}
-
`}renderImage(){return a`${this.cardImage}
+
`}renderImage(){return n`${this.cardImage}
${this.renderIcons()}
- ${this.evergreen?a`
+ ${this.evergreen?n`
- `:a`
+ `:n`
- `}`}renderInlineHeading(){return a` ${this.badge}
+ `}`}renderInlineHeading(){return n` ${this.badge}
${this.renderIcons()}
@@ -1256,16 +1137,15 @@ merch-card .footer-row-cell:nth-child(8) {
- ${this.customHr?"":a`
`} ${this.secureLabelFooter}`}renderProduct(){return a` ${this.badge}
+ ${this.customHr?"":n`
`} ${this.secureLabelFooter}`}renderProduct(){return n` ${this.badge}
${this.renderIcons()}
- ${this.secureLabelFooter}`}renderMiniCompareChart(){return a`
- ${this.renderIcons()} ${this.badge}
-
+ ${this.secureLabelFooter}`}renderMiniCompareChart(){return n` ${this.badge}
+ ${this.renderIcons()}
@@ -1276,5 +1156,5 @@ merch-card .footer-row-cell:nth-child(8) {
${this.secureLabelFooter}
-
`}connectedCallback(){super.connectedCallback(),this.#e=this.getContainer(),this.setAttribute("tabindex","0"),this.addEventListener("keydown",this.keydownHandler),this.addEventListener("mouseleave",this.toggleActionMenu),this.addEventListener("change",this.handleQuantitySelection)}disconnectedCallback(){super.disconnectedCallback(),this.removeEventListener("keydown",this.keydownHandler),this.removeEventListener("change",this.handleQuantitySelection)}keydownHandler(e){let r=document.activeElement?.closest(A);if(!r)return;function t(R,T){let f=document.elementFromPoint(R,T)?.closest(A);f&&(e.preventDefault(),e.stopImmediatePropagation(),f.focus(),f.scrollIntoView({behavior:"smooth",block:"center"}))}let{x:n,y:o,width:h,height:g}=r.getBoundingClientRect(),l=64;switch(e.code===C?e.shiftKey?u:v:e.code){case u:t(n-l,o);break;case v:t(n+h+l,o);break;case z:t(n,o-l);break;case $:t(n,o+g+l);break;case E:this.footerSlot?.querySelector("a")?.click();break}}async adjustInnerContent(){if(this.variant!==b||this.getBoundingClientRect().width===0)return;let e=[{name:"body",cssProperty:"--consonant-merch-card-mini-compare-body-height"},{name:"priceSlot",cssProperty:"--consonant-merch-card-mini-compare-price-height"},{name:"priceCommitmentSlot",cssProperty:"--consonant-merch-card-mini-compare-price-commitment-height"},{name:"offers",cssProperty:"--consonant-merch-card-mini-compare-offers-height"},{name:"promoText",cssProperty:"--consonant-merch-card-mini-compare-promo-text-height"},{name:"footer",cssProperty:"--consonant-merch-card-mini-compare-footer-height"}];for(let r of e){let t=parseInt(getComputedStyle(document.documentElement).getPropertyValue(r.cssProperty));if(this[r.name]){let n=parseInt(window.getComputedStyle(this[r.name]).height)||0;n>0&&n>t&&document.documentElement.style.setProperty(r.cssProperty,`${n}px`),this[r.name].style.height=`var(${r.cssProperty})`}}}adjustFooterRows(){if(this.variant!==b||this.getBoundingClientRect().width===0)return;[...this.querySelector('[slot="footer-rows"]').children].forEach((r,t)=>{let n=Math.max(P,parseInt(window.getComputedStyle(r).height)||0),o=parseInt(this.#e.style.getPropertyValue(L(t+1)))||0;n>o&&this.#e.style.setProperty(L(t+1),`${n}px`)})}};customElements.define(M,y);export{M as MERCH_CARD,A as MERCH_CARD_NODE_NAME,y as MerchCard,L as getRowMinHeightPropertyName};
+
`}connectedCallback(){super.connectedCallback(),this.#e=this.getContainer(),this.setAttribute("tabindex","0"),this.addEventListener("keydown",this.keydownHandler),this.addEventListener("mouseleave",this.toggleActionMenu),this.addEventListener("change",this.handleQuantitySelection)}disconnectedCallback(){super.disconnectedCallback(),this.removeEventListener("keydown",this.keydownHandler),this.removeEventListener("change",this.handleQuantitySelection)}keydownHandler(e){let r=document.activeElement?.closest(S);if(!r)return;function t(R,O){let g=document.elementFromPoint(R,O)?.closest(S);g&&(e.preventDefault(),e.stopImmediatePropagation(),g.focus(),g.scrollIntoView({behavior:"smooth",block:"center"}))}let{x:a,y:o,width:d,height:p}=r.getBoundingClientRect(),m=64;switch(e.code===E?e.shiftKey?u:v:e.code){case u:t(a-m,o);break;case v:t(a+d+m,o);break;case k:t(a,o-m);break;case z:t(a,o+p+m);break;case $:this.footerSlot?.querySelector("a")?.click();break}}adjustFooterRows(){if(this.variant!==A||this.getBoundingClientRect().width===0)return;[...this.querySelector('[slot="footer-rows"]').children].forEach((r,t)=>{let a=Math.max(_,parseInt(window.getComputedStyle(r).height)||0),o=parseInt(this.#e.style.getPropertyValue(L(t+1)))||0;a>o&&this.#e.style.setProperty(L(t+1),`${a}px`)})}};customElements.define(M,b);export{M as MERCH_CARD,S as MERCH_CARD_NODE_NAME,b as MerchCard,L as getRowMinHeightPropertyName};
//# sourceMappingURL=merch-card.js.map
diff --git a/libs/deps/merch-offer-select.js b/libs/deps/merch-offer-select.js
index ee6e431d61..613d7f8ce4 100644
--- a/libs/deps/merch-offer-select.js
+++ b/libs/deps/merch-offer-select.js
@@ -1,4 +1,4 @@
-// Thu, 07 Mar 2024 18:31:56 GMT
+// Mon, 12 Feb 2024 17:51:13 GMT
import{html as u,LitElement as p}from"/libs/deps/lit-all.min.js";import{css as d,html as a,LitElement as h}from"/libs/deps/lit-all.min.js";var o=class extends h{static styles=d`
:host .horizontal {
display: flex;
diff --git a/libs/deps/merch-quantity-select.js b/libs/deps/merch-quantity-select.js
index f0914ddef8..c412e2da57 100644
--- a/libs/deps/merch-quantity-select.js
+++ b/libs/deps/merch-quantity-select.js
@@ -1,4 +1,4 @@
-// Thu, 07 Mar 2024 18:31:56 GMT
+// Mon, 12 Feb 2024 17:51:13 GMT
// src/merch-quantity-select.js
import { html, css as css2, LitElement } from "/libs/deps/lit-all.min.js";
diff --git a/libs/features/footer-promo.js b/libs/features/footer-promo.js
index 759a6bc66d..9854983afc 100644
--- a/libs/features/footer-promo.js
+++ b/libs/features/footer-promo.js
@@ -1,4 +1,5 @@
import { createTag, getConfig } from '../utils/utils.js';
+import { decorateSectionAnalytics } from '../martech/attributes.js';
async function getPromoFromTaxonomy(contentRoot) {
const NAME_KEY = 'Name';
@@ -25,7 +26,8 @@ async function getPromoFromTaxonomy(contentRoot) {
}
export default async function initFooterPromo(footerPromoTag, footerPromoType) {
- const { locale: { contentRoot } } = getConfig();
+ const config = getConfig();
+ const { locale: { contentRoot } } = config;
let href = footerPromoTag && `${contentRoot}/fragments/footer-promos/${footerPromoTag}`;
if (footerPromoType === 'taxonomy') {
@@ -42,4 +44,6 @@ export default async function initFooterPromo(footerPromoTag, footerPromoType) {
document.querySelector('main > div:last-of-type').insertAdjacentElement('afterend', section);
await loadFragment(a);
section.classList.add('section');
+ const sections = document.querySelectorAll('main > div');
+ decorateSectionAnalytics(section, sections.length - 1, config);
}
diff --git a/libs/features/icons/icons.js b/libs/features/icons/icons.js
index 8645fb225b..53bb484b6b 100644
--- a/libs/features/icons/icons.js
+++ b/libs/features/icons/icons.js
@@ -4,7 +4,9 @@ let fetched = false;
async function getSVGsfromFile(path) {
/* c8 ignore next */
if (!path) return null;
- const resp = await fetch(path);
+ const { customFetch } = await import('../../utils/helpers.js');
+ const resp = await customFetch({ resource: path, withCacheRules: true })
+ .catch(() => ({}));
/* c8 ignore next */
if (!resp.ok) return null;
const miloIcons = {};
diff --git a/libs/features/placeholders.js b/libs/features/placeholders.js
index 2a97aa928e..bdda605b3a 100644
--- a/libs/features/placeholders.js
+++ b/libs/features/placeholders.js
@@ -6,13 +6,15 @@ const getPlaceholdersPath = (config, sheet) => {
return `${path}${query}`;
};
-const fetchPlaceholders = (config, sheet) => {
+const fetchPlaceholders = async (config, sheet) => {
const placeholdersPath = getPlaceholdersPath(config, sheet);
+ const { customFetch } = await import('../utils/helpers.js');
fetchedPlaceholders[placeholdersPath] = fetchedPlaceholders[placeholdersPath]
// eslint-disable-next-line no-async-promise-executor
|| new Promise(async (resolve) => {
- const resp = await fetch(placeholdersPath).catch(() => ({}));
+ const resp = await customFetch({ resource: placeholdersPath, withCacheRules: true })
+ .catch(() => ({}));
const json = resp.ok ? await resp.json() : { data: [] };
if (json.data.length === 0) { resolve({}); return; }
const placeholders = {};
diff --git a/libs/utils/helpers.js b/libs/utils/helpers.js
index 73274a4988..7e6fc5ad62 100644
--- a/libs/utils/helpers.js
+++ b/libs/utils/helpers.js
@@ -19,3 +19,12 @@ export function updateLinkWithLangRoot(link) {
return link;
}
}
+
+export async function customFetch({ resource, withCacheRules }) {
+ const options = {};
+ if (withCacheRules) {
+ const params = new URLSearchParams(window.location.search);
+ options.cache = params.get('cache') === 'off' ? 'reload' : 'default';
+ }
+ return fetch(resource, options);
+}
diff --git a/test/blocks/chart/chart.test.js b/test/blocks/chart/chart.test.js
index 4d349f8829..47860e3075 100644
--- a/test/blocks/chart/chart.test.js
+++ b/test/blocks/chart/chart.test.js
@@ -41,9 +41,12 @@ setConfig(config);
describe('chart', () => {
let fetch;
+ let paramsGetStub;
before(() => {
fetch = sinon.stub(window, 'fetch');
+ paramsGetStub = sinon.stub(URLSearchParams.prototype, 'get');
+ paramsGetStub.withArgs('cache').returns('off');
});
after(() => {
@@ -466,6 +469,16 @@ describe('chart', () => {
expect(typeof options.yAxis[0].axisLabel.formatter()).to.equal('string');
});
+ it('fetchData functions as expected with cache control enabled', async () => {
+ const link = document.createElement('a');
+ const linkRel = '/drafts/data-viz/line.json';
+ link.href = `${linkRel}`;
+ const goodResponse = { ok: true, json: () => true };
+ fetch.withArgs(link.href, { cache: 'reload' }).resolves(goodResponse);
+ const response = await fetchData(link);
+ expect(response).to.be.true;
+ });
+
it('fetchData returns json given an anchor tag', async () => {
const link = document.createElement('a');
const linkRel = '/drafts/data-viz/line.json';
diff --git a/test/blocks/fragment/fragment.test.js b/test/blocks/fragment/fragment.test.js
index 2e734c40c7..df387803e5 100644
--- a/test/blocks/fragment/fragment.test.js
+++ b/test/blocks/fragment/fragment.test.js
@@ -23,6 +23,17 @@ document.body.innerHTML = await readFile({ path: './mocks/body.html' });
const { default: getFragment } = await import('../../../libs/blocks/fragment/fragment.js');
describe('Fragments', () => {
+ let paramsGetStub;
+
+ before(() => {
+ paramsGetStub = stub(URLSearchParams.prototype, 'get');
+ paramsGetStub.withArgs('cache').returns('off');
+ });
+
+ after(() => {
+ paramsGetStub.restore();
+ });
+
it('Loads a fragment', async () => {
const a = document.querySelector('a');
await getFragment(a);
@@ -30,6 +41,13 @@ describe('Fragments', () => {
expect(h1).to.exist;
});
+ it('Loads a fragment with cache control', async () => {
+ const a = document.querySelector('a.cache');
+ await getFragment(a);
+ const h1 = document.querySelector('h1.frag-cache');
+ expect(h1).to.exist;
+ });
+
it('Doesnt load a fragment', async () => {
const a = document.querySelector('a.bad');
await getFragment(a);
diff --git a/test/blocks/fragment/mocks/body.html b/test/blocks/fragment/mocks/body.html
index 9eb799258a..4cfbfd6618 100644
--- a/test/blocks/fragment/mocks/body.html
+++ b/test/blocks/fragment/mocks/body.html
@@ -1,5 +1,6 @@
Fragment
+
Fragment
Fragment
Fragment
Fragment
diff --git a/test/blocks/fragment/mocks/fragments/frag-cache.plain.html b/test/blocks/fragment/mocks/fragments/frag-cache.plain.html
new file mode 100644
index 0000000000..a242cdc0b9
--- /dev/null
+++ b/test/blocks/fragment/mocks/fragments/frag-cache.plain.html
@@ -0,0 +1,3 @@
+
+
Hello World
+
diff --git a/test/blocks/global-navigation/global-navigation.test.js b/test/blocks/global-navigation/global-navigation.test.js
index 9d5df4375a..ca97ec9717 100644
--- a/test/blocks/global-navigation/global-navigation.test.js
+++ b/test/blocks/global-navigation/global-navigation.test.js
@@ -1393,7 +1393,7 @@ describe('global navigation', () => {
document.body.replaceChildren(toFragment`
`);
await initGnav(document.body.querySelector('header'));
expect(
- fetchStub.calledOnceWith('https://main--federal--adobecom.hlx.page/federal/path/to/gnav.plain.html'),
+ fetchStub.calledOnceWith('https://www.stage.adobe.com/federal/path/to/gnav.plain.html'),
).to.be.true;
});
@@ -1403,7 +1403,7 @@ describe('global navigation', () => {
document.body.replaceChildren(toFragment`
`);
await initGnav(document.body.querySelector('header'));
expect(
- fetchStub.calledOnceWith('https://main--federal--adobecom.hlx.page/federal/path/to/gnav.plain.html'),
+ fetchStub.calledOnceWith('https://www.stage.adobe.com/federal/path/to/gnav.plain.html'),
).to.be.true;
});
});
diff --git a/test/blocks/global-navigation/test-utilities.js b/test/blocks/global-navigation/test-utilities.js
index 9e5035ea6e..020bc851cd 100644
--- a/test/blocks/global-navigation/test-utilities.js
+++ b/test/blocks/global-navigation/test-utilities.js
@@ -171,7 +171,7 @@ export const createFullGlobalNavigation = async ({
if (url.endsWith('large-menu-cross-cloud.plain.html')) { return mockRes({ payload: largeMenuCrossCloud }); }
if (url.endsWith('large-menu-active.plain.html')) { return mockRes({ payload: largeMenuActiveMock }); }
if (url.endsWith('large-menu-wide-column.plain.html')) { return mockRes({ payload: largeMenuWideColumnMock }); }
- if (url.includes('main--federal--adobecom.hlx.page')
+ if (url.includes('https://www.stage.adobe.com')
&& url.endsWith('feds-menu.plain.html')) { return mockRes({ payload: largeMenuMock }); }
if (url.includes('gnav')) { return mockRes({ payload: globalNavigation || globalNavigationMock }); }
if (url.includes('correct-promo-fragment')) { return mockRes({ payload: correctPromoFragmentMock }); }
diff --git a/test/blocks/global-navigation/utilities/utilities.test.js b/test/blocks/global-navigation/utilities/utilities.test.js
index f9cbae7e00..d9606b18be 100644
--- a/test/blocks/global-navigation/utilities/utilities.test.js
+++ b/test/blocks/global-navigation/utilities/utilities.test.js
@@ -19,6 +19,7 @@ import {
import { setConfig } from '../../../../libs/utils/utils.js';
import { createFullGlobalNavigation, config } from '../test-utilities.js';
+const baseHost = 'https://www.stage.adobe.com';
describe('global navigation utilities', () => {
beforeEach(() => {
document.body.innerHTML = '';
@@ -39,7 +40,7 @@ describe('global navigation utilities', () => {
describe('getFedsContentRoot', () => {
it('should return content source for localhost', () => {
const contentSource = getFederatedContentRoot();
- expect(contentSource).to.equal('https://main--federal--adobecom.hlx.page');
+ expect(contentSource).to.equal(baseHost);
});
});
@@ -114,7 +115,7 @@ describe('global navigation utilities', () => {
});
federatePictureSources(template);
verifyImageTemplate({
- host: 'https://main--federal--adobecom.hlx.page',
+ host: baseHost,
path: '/federal/media.png',
locale: '',
template,
@@ -129,7 +130,7 @@ describe('global navigation utilities', () => {
});
federatePictureSources(template);
verifyImageTemplate({
- host: 'https://main--federal--adobecom.hlx.page',
+ host: baseHost,
path: '/federal/media.png',
locale: '/ch_de',
template,
@@ -174,7 +175,7 @@ describe('global navigation utilities', () => {
});
federatePictureSources(template);
verifyImageTemplate({
- host: 'https://main--federal--adobecom.hlx.page',
+ host: baseHost,
path: '/federal/media.png',
locale: '',
template,
@@ -189,7 +190,7 @@ describe('global navigation utilities', () => {
});
federatePictureSources(template);
verifyImageTemplate({
- host: 'https://main--federal--adobecom.hlx.page',
+ host: baseHost,
path: '/federal/media.png',
locale: '/ch_de',
template,
@@ -207,7 +208,7 @@ describe('global navigation utilities', () => {
const { locale: { ietf, prefix, contentRoot } } = getFedsPlaceholderConfig(placeholderConfig);
expect(ietf).to.equal('en-US');
expect(prefix).to.equal('');
- expect(contentRoot).to.equal('https://main--federal--adobecom.hlx.page/federal/globalnav');
+ expect(contentRoot).to.equal(`${baseHost}/federal/globalnav`);
});
it('should return a config object for a specific locale', () => {
@@ -223,7 +224,7 @@ describe('global navigation utilities', () => {
const { locale: { ietf, prefix, contentRoot } } = getFedsPlaceholderConfig(placeholderConfig);
expect(ietf).to.equal('fi-FI');
expect(prefix).to.equal('/fi');
- expect(contentRoot).to.equal('https://main--federal--adobecom.hlx.page/fi/federal/globalnav');
+ expect(contentRoot).to.equal(`${baseHost}/fi/federal/globalnav`);
});
});
@@ -399,12 +400,12 @@ describe('global navigation utilities', () => {
expect(
getFederatedUrl('https://adobe.com/federal/foo-fragment.html'),
).to.equal(
- 'https://main--federal--adobecom.hlx.page/federal/foo-fragment.html',
+ `${baseHost}/federal/foo-fragment.html`,
);
expect(
getFederatedUrl('https://adobe.com/lu_de/federal/gnav/foofooter.html'),
).to.equal(
- 'https://main--federal--adobecom.hlx.page/lu_de/federal/gnav/foofooter.html',
+ `${baseHost}/lu_de/federal/gnav/foofooter.html`,
);
});
@@ -412,7 +413,7 @@ describe('global navigation utilities', () => {
expect(
getFederatedUrl('/federal/foo-fragment.html'),
).to.equal(
- 'https://main--federal--adobecom.hlx.page/federal/foo-fragment.html',
+ `${baseHost}/federal/foo-fragment.html`,
);
});
@@ -420,7 +421,7 @@ describe('global navigation utilities', () => {
expect(
getFederatedUrl('/federal/foo-fragment.html?foo=bar#test'),
).to.equal(
- 'https://main--federal--adobecom.hlx.page/federal/foo-fragment.html?foo=bar#test',
+ `${baseHost}/federal/foo-fragment.html?foo=bar#test`,
);
});
diff --git a/test/features/icons/icons.test.js b/test/features/icons/icons.test.js
index a0a4c7afd4..cd355a0aff 100644
--- a/test/features/icons/icons.test.js
+++ b/test/features/icons/icons.test.js
@@ -1,6 +1,7 @@
import { readFile } from '@web/test-runner-commands';
import { expect } from '@esm-bundle/chai';
-import { setConfig, getConfig } from '../../../libs/utils/utils.js';
+import { stub } from 'sinon';
+import { setConfig, getConfig, createTag } from '../../../libs/utils/utils.js';
const { default: loadIcons } = await import('../../../libs/features/icons/icons.js');
@@ -14,12 +15,28 @@ document.body.innerHTML = await readFile({ path: './mocks/body.html' });
let icons;
describe('Icon Suppprt', () => {
+ let paramsGetStub;
+
+ before(() => {
+ paramsGetStub = stub(URLSearchParams.prototype, 'get');
+ paramsGetStub.withArgs('cache').returns('off');
+ });
+
+ after(() => {
+ paramsGetStub.restore();
+ });
+
before(async () => {
icons = document.querySelectorAll('span.icon');
await loadIcons(icons, config);
await loadIcons(icons, config); // Test duplicate icon not created if run twice
});
+ it('Fetches successfully with cache control enabled', async () => {
+ const otherIcons = [createTag('span', { class: 'icon icon-play' })];
+ await loadIcons(otherIcons, config);
+ });
+
it('Replaces span.icon', async () => {
const selector = icons[0].querySelector(':scope svg');
expect(selector).to.exist;
diff --git a/test/features/placeholders/placeholders.json b/test/features/placeholders/placeholders.json
index 40e6e7f4bc..114b944d14 100644
--- a/test/features/placeholders/placeholders.json
+++ b/test/features/placeholders/placeholders.json
@@ -3,6 +3,10 @@
"offset": 0,
"limit": 21,
"data": [
+ {
+ "key": "testing-cache",
+ "value": "Testing cache"
+ },
{
"key": "recommended-for-you",
"value": "Recommended for you"
diff --git a/test/features/placeholders/placeholders.test.js b/test/features/placeholders/placeholders.test.js
index f43bb913d4..dea51d6e34 100644
--- a/test/features/placeholders/placeholders.test.js
+++ b/test/features/placeholders/placeholders.test.js
@@ -1,4 +1,5 @@
import { expect } from '@esm-bundle/chai';
+import { stub } from 'sinon';
import { setConfig, getConfig } from '../../../libs/utils/utils.js';
import { replaceText, replaceKey, replaceKeyArray } from '../../../libs/features/placeholders.js';
@@ -8,11 +9,27 @@ setConfig(conf);
const config = getConfig();
describe('Placeholders', () => {
+ let paramsGetStub;
+
+ before(() => {
+ paramsGetStub = stub(URLSearchParams.prototype, 'get');
+ paramsGetStub.withArgs('cache').returns('off');
+ });
+
+ after(() => {
+ paramsGetStub.restore();
+ });
+
it('Fails on JSON', async () => {
const text = await replaceKey('recommended-for-you', config);
expect(text).to.equal('recommended for you');
});
+ it('Works with cache control', async () => {
+ const text = await replaceText('Look at me, I am {{testing-cache}}', config);
+ expect(text).to.equal('Look at me, I am testing cache');
+ });
+
it('Replaces text & links', async () => {
config.locale.contentRoot = '/test/features/placeholders';
const regex = /{{(.*?)}}|%7B%7B(.*?)%7D%7D/g;
diff --git a/test/utils/helpers.test.js b/test/utils/helpers.test.js
new file mode 100644
index 0000000000..2c8fb91ddb
--- /dev/null
+++ b/test/utils/helpers.test.js
@@ -0,0 +1,19 @@
+import { expect } from '@esm-bundle/chai';
+import { stub } from 'sinon';
+
+const { customFetch } = await import('../../libs/utils/helpers.js');
+
+describe('Cache control', async () => {
+ it('fetches with cache param', async () => {
+ const paramsGet = stub(URLSearchParams.prototype, 'get');
+ const fetchStub = stub(window, 'fetch');
+ const goodResponse = { ok: true, json: () => true };
+ const mockUrl = './mocks/taxonomy.json';
+ paramsGet.withArgs('cache').returns('off');
+ fetchStub.withArgs(mockUrl, { cache: 'reload' }).resolves(goodResponse);
+ const resp = await customFetch({ resource: mockUrl, withCacheRules: true });
+ expect(resp.json()).to.be.true;
+ paramsGet.restore();
+ fetchStub.restore();
+ });
+});