wickes-css2 2.105.0-develop.7 → 2.105.0-develop.8

package/src/js/page/klarna-modal-scroll-disable.js

@@ -2,18 +2,18 @@ var Wick = Wick || {};
 
 Wick.KlarnaModalScrollDisable = (function () {
     const $body = $('body'),
-        klarnaPopUp = 'klarna-osm-interstitial',
-        scrollDisableClass = 'overflow-hidden';
+          klarnaPopUp = 'klarna-osm-interstitial',
+          scrollDisableClass = 'overflow-hidden';
 
     window.addEventListener(klarnaPopUp, (e) => {
         let isKlarnaPopUpActive = e.detail.action === 'show';
 
         if (isKlarnaPopUpActive) {
             $body.addClass(scrollDisableClass);
-            $body.trigger('tagKlarnaModalAdded');
+            $body.trigger('tagKlarnaModalAdded')
         } else {
             $body.removeClass(scrollDisableClass);
             $body.trigger('tagKlarnaModalRemoved');
-        }
+        };
     });
 })();

package/src/js/page/my-account.js

@@ -9,38 +9,23 @@ Wick.MyAccount = {
     appInfo: '.app-info',
     hideAppInfo: 'app-info--hide'
   },
-  clipboardCodes: {
-    tradeProId: {
-      titleEl: '.clipboard-code.trade-pro-id .title',
-      subtitleEl: '.clipboard-code.trade-pro-id .subtitle',
-      btnCopy: '.btn--trade-pro-id',
-    },
-    discountCode: {
-      titleEl: '.clipboard-code.discount-code .title',
-      subtitleEl: '.clipboard-code.discount-code .subtitle',
-      btnCopy: '.btn--discount-code',
-    },
-  },
-  copyCode(codeType) {
-    const { titleEl, subtitleEl, btnCopy } = Wick.MyAccount.clipboardCodes[codeType];
-    const value = $(subtitleEl).text().trim();
-    const title = $(titleEl).text().trim();
+  copyCode($btn) {
+    const $container = $btn.closest('.clipboard-code');
+    const value = $container.find('.subtitle').text().trim();
+    const title = $container.find('.title').text().trim();
 
-    copyToClipboard(value, btnCopy);
-    Wick.SnackBar.show(
-      {
-        text: `${title} copied to clipboard`,
-        type: Wick.SnackBar.types.SUCCESS,
-        withCloseButton: false,
-        autoClose: true,
-        delayBeforeClose: 1500
-      }
-    );
+    copyToClipboard(value, $btn);
+    Wick.SnackBar.show({
+      text: `${title} copied to clipboard`,
+      type: Wick.SnackBar.types.SUCCESS,
+      withCloseButton: false,
+      autoClose: true,
+      delayBeforeClose: 1500
+    });
   },
   init() {
-    Object.keys(Wick.MyAccount.clipboardCodes).forEach((codeType) => {
-      const { btnCopy } = Wick.MyAccount.clipboardCodes[codeType];
-      $(btnCopy).on('click', () => Wick.MyAccount.copyCode(codeType));
+    Wick.MyAccount.el.$clipboardCode.find('.copy-code').on('click', function() {
+      Wick.MyAccount.copyCode($(this));
     });
 
     if($(Wick.MyAccount.el.appInfo).length && isApp()) {

package/src/js/page/online-exclusive.js

@@ -1,5 +1,6 @@
 var Wick = Wick || {};
 Wick.onlineExclusive = (function () {
+
     let rangesToggler = $('.ranges-toggle'),
         rangesList = $('.ranges'),
         otherRanges = $('.other-ranges'),
@@ -26,10 +27,8 @@ Wick.onlineExclusive = (function () {
         otherRangesHeating = $('.other-ranges__item_heating');
 
     rangesToggler.on('click', function () {
-        rangesToggler
-            .toggleClass('border-bottom-rounded_false')
-            .find('.icon')
-            .toggleClass('icon-rotated');
+        rangesToggler.toggleClass('border-bottom-rounded_false')
+            .find('.icon').toggleClass('icon-rotated');
         if (window.innerWidth > 768) {
             rangesList.toggleClass('d-block border-bottom-rounded');
         } else if (window.innerWidth < 768) {
@@ -39,17 +38,18 @@ Wick.onlineExclusive = (function () {
     });
 
     if (window.innerWidth < 768) {
-        rangesList.on('click', 'a', function (e) {
+        rangesList.on( 'click', 'a', function(e) {
             e.preventDefault();
             otherRanges.show();
 
-            $(document).mouseup(function (e) {
-                if (!rangesList.is(e.target) && rangesList.has(e.target).length === 0) {
+            $(document).mouseup(function(e) {
+                if (!rangesList.is(e.target) && rangesList.has(e.target).length === 0)
+                {
                     rangesList.hide();
                 }
             });
 
-            switch ($(this).parent().attr('data-value')) {
+            switch ($(this).parent().attr("data-value")) {
                 case 'gardens-btn':
                     rangesComponent.hide();
                     gardensComponent.show();
@@ -96,13 +96,15 @@ Wick.onlineExclusive = (function () {
                     otherRanges.hide();
                     break;
             }
+
         });
-    } else if (window.innerWidth >= 768) {
-        rangesList.on('click', 'a', function (e) {
+    }
+    else if (window.innerWidth >= 768) {
+        rangesList.on( 'click', 'a', function(e) {
             e.preventDefault();
             otherRanges.show();
 
-            switch ($(this).parent().attr('data-value')) {
+            switch ($(this).parent().attr("data-value")) {
                 case 'gardens-btn':
                     rangesEl.removeClass('range-btn');
                     $(this).addClass('range-btn');
@@ -169,10 +171,10 @@ Wick.onlineExclusive = (function () {
                     break;
             }
         });
-        otherRangesList.on('click', 'a', function (e) {
+        otherRangesList.on( 'click', 'a', function(e) {
             e.preventDefault();
 
-            switch ($(this).parent().parent().attr('data-value')) {
+            switch ($(this).parent().parent().attr("data-value")) {
                 case 'gardens-btn':
                     rangesEl.removeClass('range-btn');
                     $('#gardens-btn').addClass('range-btn');
@@ -241,33 +243,33 @@ Wick.onlineExclusive = (function () {
         });
     }
 
-    viewBtn.on('click', function (e) {
+    viewBtn.on('click', function(e) {
         e.preventDefault();
         rangesComponent.show();
         otherRanges.hide();
         rangesEl.removeClass('range-btn');
     });
 
-    $(function () {
-        $('a.online-exclusive__banner').on('click', function (event) {
+    $(function(){
+        $('a.online-exclusive__banner').on('click', function(event) {
             event.preventDefault();
-            let sc = $(this).attr('href'),
+            let sc = $(this).attr("href"),
                 dn = $(sc).offset().top - 10;
-            $('html, body').animate({ scrollTop: dn }, 1000);
+            $('html, body').animate({scrollTop: dn}, 1000);
         });
     });
 
-    $(function () {
-        $('a.view-link').on('click', function (event) {
+    $(function(){
+        $('a.view-link').on('click', function(event) {
             event.preventDefault();
-            let sc = $(this).attr('href'),
+            let sc = $(this).attr("href"),
                 dn = $(sc).offset().top - 10;
-            $('html, body').animate({ scrollTop: dn }, 1000);
+            $('html, body').animate({scrollTop: dn}, 1000);
         });
     });
 
-    $(function () {
-        $('a.ranges-el').on('click', function (event) {
+    $(function(){
+        $('a.ranges-el').on('click', function(event) {
             event.preventDefault();
             let dn;
 
@@ -279,12 +281,12 @@ Wick.onlineExclusive = (function () {
                 dn = 990;
             }
 
-            $('html, body').animate({ scrollTop: dn }, 1000);
+            $('html, body').animate({scrollTop: dn}, 1000);
         });
     });
 
-    $(function () {
-        $('.other-ranges__item').on('click', function (event) {
+    $(function(){
+        $('.other-ranges__item').on('click', function(event) {
             event.preventDefault();
             let dn;
 
@@ -296,7 +298,7 @@ Wick.onlineExclusive = (function () {
                 dn = 810;
             }
 
-            $('html, body').animate({ scrollTop: dn }, 1000);
+            $('html, body').animate({scrollTop: dn}, 1000);
         });
     });
 })();

package/src/js/page/tradePro-rewards.js

@@ -1,76 +1,46 @@
-import { copyToClipboard } from './utils/copy-to-clipboard';
+import {copyToClipboard} from "./utils/copy-to-clipboard";
 
 var Wick = window.Wick || {};
 
 Wick.TradeProRewards = {
-    el: {
-        $tradeProRewards: $('.page_tradePro-rewards'),
-        buttonSelector: '.copy-tradePro-barcode',
-    },
-
-    message: 'Code copied to clipboard',
-    errorMessage: 'Unable to copy. Please copy manually',
-
-    copyToClipboardInit() {
-        Wick.SnackBar.init();
-
-        $(document).on('click', Wick.TradeProRewards.el.buttonSelector, async function (e) {
-            e.preventDefault();
-            e.stopPropagation();
-
-            const $btn = $(this);
-            const $input = $btn.parent().find('input');
-
-            if (!$input.length) return false;
-
-            const discountCodeValue = ($input.val() || '').trim();
-            if (!discountCodeValue) return false;
-
-            $input.removeAttr('disabled').attr('readonly', 'readonly');
-
-            try {
-                await copyToClipboard(discountCodeValue, e.currentTarget, { noUpperCase: true });
-
-                Wick.SnackBar.show({
-                    text: Wick.TradeProRewards.message,
-                    type: Wick.SnackBar.types.SUCCESS,
-                    withCloseButton: false,
-                    autoClose: true,
-                    delayBeforeClose: 3000,
-                });
-            } catch (err) {
-                try {
-                    const el = $input.get(0);
-                    el.focus();
-                    el.select();
-                    el.setSelectionRange(0, 999999);
-                } catch (e) {
-                    console.error(e);
-                }
-
-                Wick.SnackBar.show({
-                    text: Wick.TradeProRewards.errorMessage,
-                    type: Wick.SnackBar.types.ERROR,
-                    withCloseButton: false,
-                    autoClose: true,
-                    delayBeforeClose: 4000,
-                });
-            }
-
-            $input.attr('disabled', 'disabled').removeAttr('readonly');
-            window.getSelection()?.removeAllRanges?.();
-
-            return false;
-        });
-    },
-
-    init() {
-        Wick.TradeProRewards.copyToClipboardInit();
-    },
-};
+  el: {
+    $tradeProRewards: $('.page_tradePro-rewards'),
+    buttonSelector: '.copy-tradePro-barcode',
+  },
+  message: 'Code copied to clipboard',
+  copyToClipboardInit() {
+    Wick.SnackBar.init();
+    $(Wick.TradeProRewards.el.buttonSelector).on('click', function (e) {
+      e.preventDefault();
+      e.stopPropagation();
+      var discountCode = $(this).parent().find('input');
+      var discountCodeValue = discountCode.val().trim();
+      discountCode.removeAttr('disabled').attr('readonly', 'readonly');
+
+      copyToClipboard(discountCodeValue, e.currentTarget, { noUpperCase: true });
+
+      discountCode.attr('disabled', 'disabled').removeAttr('readonly');
+      window.getSelection().removeAllRanges();
+
+      Wick.SnackBar.show(
+        {
+          text: Wick.TradeProRewards.message,
+          type: Wick.SnackBar.types.SUCCESS,
+          withCloseButton: false,
+          autoClose: true,
+          delayBeforeClose: 3000
+        }
+      );
+      return false;
+    });
+  },
+  init() {
+    Wick.TradeProRewards.copyToClipboardInit();
+  }
+}
 
 $(document).ready(function () {
-    if (Wick.TradeProRewards.el.$tradeProRewards.length) {
-        Wick.TradeProRewards.init();
-    }
+  if (Wick.TradeProRewards.el.$tradeProRewards.length) {
+    Wick.TradeProRewards.init();
+  }
 });

package/src/js/page/utils/copy-to-clipboard.js

@@ -1,88 +1,56 @@
 export function copyToClipboard(copyValue, currentSelector, options = {}) {
-    const textTrimmed = normalizeCopyText(copyValue, options);
+  const $temp = $('<textarea>').css({
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    opacity: 0
+  });
+
+  $(currentSelector).parent().append($temp);
+
+  let str;
+  if (options.noUpperCase) {
+    str = copyValue;
+  } else {
+    str = copyValue.replace(/(^\w|\s\w)/g, function (m) {
+      return m.toUpperCase()
+    });
+  }
 
-    if (!textTrimmed) return Promise.reject(new Error('Empty text'));
+  const textFiltered = str.split(' ').filter(function (value) {
+    return value !== ''
+  });
 
-    // 1) iOS app bridge (WKWebView)
-    if (window.webkit?.messageHandlers?.copy) {
-        try {
-            window.webkit.messageHandlers.copy.postMessage(textTrimmed);
-            return Promise.resolve(true);
-        } catch (e) {
-            console.error(e);
-        }
-    }
+  const textTrimmed = textFiltered.join(' ');
 
-    // 2) Android app bridge
-    if (window.Android?.copyToClipboard && typeof window.Android.copyToClipboard === 'function') {
-        try {
-            window.Android.copyToClipboard(textTrimmed);
-            return Promise.resolve(true);
-        } catch (e) {
-            console.error(e);
-        }
-    }
+  $temp.val(textTrimmed);
 
-    if (navigator.clipboard?.writeText) {
-        return navigator.clipboard.writeText(textTrimmed).then(() => true);
-    }
+  if (navigator.userAgent.match(/TradeProMobile_iOS|DIYMobile_iOS/i)) {
+    iosCopyToClipboard($temp);
+  } else if (navigator.userAgent.match(/ipad|ipod|iphone/i)) {
+    $temp.select();
+    $temp[0].setSelectionRange(0, 999999);
+  } else {
+    $temp.select();
+  }
 
-    return legacyExecCommandCopy(textTrimmed, currentSelector);
+  document.execCommand("copy");
+  $temp.remove();
 }
 
-function normalizeCopyText(copyValue, options) {
-    let raw = copyValue == null ? '' : copyValue + '';
-
-    const str = options.noUpperCase ? raw : raw.replace(/(^\w|\s\w)/g, (m) => m.toUpperCase());
-
-    return str
-        .split(' ')
-        .filter((v) => v !== '')
-        .join(' ')
-        .trim();
-}
-
-function legacyExecCommandCopy(text, currentSelector) {
-    return new Promise(function (resolve, reject) {
-        try {
-            let $parent = $(currentSelector).parent();
-
-            let $temp = $('<textarea>').val(text).attr('readonly', 'readonly').css({
-                position: 'fixed',
-                top: 0,
-                left: '-9999px',
-                opacity: 0,
-                width: '1px',
-                height: '1px',
-                padding: 0,
-                border: 0,
-                margin: 0,
-            });
-
-            $parent.append($temp);
-
-            let el = $temp.get(0);
-
-            el.focus();
-            let len = (el.value || '').length;
-            if (typeof el.setSelectionRange === 'function') {
-                el.setSelectionRange(0, len);
-            } else {
-                $temp.select();
-            }
-
-            let ok = document.execCommand('copy');
-
-            $temp.remove();
-
-            if (window.getSelection) {
-                let sel = window.getSelection();
-                if (sel && sel.removeAllRanges) sel.removeAllRanges();
-            }
-
-            ok ? resolve(true) : reject(new Error('execCommand failed'));
-        } catch (e) {
-            reject(e);
-        }
-    });
+function iosCopyToClipboard($input) {
+  const el = $input.get(0);
+  const editable = el.contentEditable;
+  const readOnly = el.readOnly;
+  const range = document.createRange();
+  const sel = window.getSelection();
+
+  el.contentEditable = true;
+  el.readOnly = false;
+  range.selectNodeContents(el);
+  sel.removeAllRanges();
+  sel.addRange(range);
+  el.setSelectionRange(0, 999999);
+  el.contentEditable = editable;
+  el.readOnly = readOnly;
 }

package/src/js/page/utils/helpers.js

@@ -3,7 +3,7 @@ export function highlightCharacter(str, char, charClass) {
         return str;
     }
 
-    const pattern = new RegExp(`\\${char}+`, 'g');
+    const pattern = new RegExp(`\\${char}+`, "g");
     const replacement = `<span class="${charClass}">$&</span>`;
 
     return str.replace(pattern, replacement);
@@ -12,7 +12,7 @@ export function highlightCharacter(str, char, charClass) {
 export function createImageElements(images, alt) {
     return images.map((link) => {
         return $('<img>').attr('src', link).attr('alt', alt);
-    });
+    })
 }
 
 export function countLetters(str) {
@@ -35,17 +35,15 @@ export function isKeyboardOpen() {
     return screenHeight !== screenHeightWithoutKeyboard;
 }
 
-export function isTouchDevice() {
+export function isTouchDevice () {
     return 'ontouchstart' in window;
 }
 
-export function isApp() {
-    return navigator.userAgent.match(
-        /TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android|DIYApp_Guest_Mobile_iOS|DIYApp_Guest_Mobile_Android|AGENT_PLACEHOLDER/i
-    );
+export function isApp () {
+    return navigator.userAgent.match(/TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android|DIYApp_Guest_Mobile_iOS|DIYApp_Guest_Mobile_Android|AGENT_PLACEHOLDER/i);
 }
 
-export function trimFields() {
+export function trimFields () {
     const fields = Wick.AddressBook.getFieldsConfigurations();
     fields.forEach((field) => {
         const trimmedValue = field.input.val().trim();
@@ -57,11 +55,8 @@ export function scrollToElement(element, offset = 20) {
     const targetElement = $(element);
 
     if (targetElement.length > 0) {
-        $('html, body').animate(
-            {
-                scrollTop: targetElement.offset().top - offset,
-            },
-            300
-        );
+        $('html, body').animate({
+            scrollTop: targetElement.offset().top - offset
+        }, 300);
     }
 }

package/src/page_empty-shared-project-list-bicester-hub.html

@@ -6,9 +6,5 @@
 <main>
     {{> shopping-list-bicester-hub emptyShopList="true" }}
 </main>
-<script defer src="./js/share-project-list.min.js"></script>
-{{/content}}
-{{#content "foot" mode="append"}}
-<script defer src="./js/saving-shopping-list.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_empty-shopping-list_guest.html

@@ -5,6 +5,5 @@
 <main>
     {{> shopping-list emptyShopList=true pagination=false}}
 </main>
-<script defer src="./js/share-project-list.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_kitchen-plp.html

@@ -11,8 +11,8 @@
         </main>
     {{/content}}
     {{#content "foot" mode="append"}}
-        {{> kitchen/filter-modal isKitchenMode=true modalTitle="Filter by" }}
+        {{> kitchen/filter-modal }}
+        <script src="./js/page/accordion.js"></script>
         <script src="./js/kitchen/kitchen-plp.min.js"></script>
-        <script src="./js/plp-filters.min.js"></script>
     {{/content}}
 {{/extend}}

package/src/page_my-account-installer.html

@@ -33,7 +33,7 @@
               subtitle=my_account.user.email
           }}
           {{> my-account/discount
-              discountSrc=my_account.installer.discount
+              discountText=my_account.installer.discountText
               installer=true
               title="In-store discount"
               code=my_account.discount