Merge pull request #85 from PrestaShop/dev

Release version 3.0.3

_dev/front/index.js

@@ -22,6 +22,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
+import 'jquery-ui-touch-punch';
 import './events';
 import './slider.scss';
 import './facet.scss';

_dev/front/slider.js

@@ -26,10 +26,10 @@
 import getQueryParameters from './urlparser';
 import NumberFormatter from '../cldr/number-formatter';
 
-let formatter;
+const formatters = {};
 
-const displayLabelBlock = (displayBlock, min, max) => {
-  if (formatter === undefined) {
+const displayLabelBlock = (formatterId, displayBlock, min, max) => {
+  if (formatters[formatterId] === undefined) {
     displayBlock.text(
       displayBlock.text().replace(
         /([^\d]*)(?:[\d .,]+)([^\d]+)(?:[\d .,]+)(.*)/,
@@ -38,7 +38,7 @@ const displayLabelBlock = (displayBlock, min, max) => {
     );
   } else {
     displayBlock.text(
-      `${formatter.format(min)} - ${formatter.format(max)}`,
+      `${formatters[formatterId].format(min)} - ${formatters[formatterId].format(max)}`,
     );
   }
 };
@@ -52,10 +52,11 @@ const refreshSliders = () => {
     const values = $el.data('slider-values');
     const specifications = $el.data('slider-specifications');
     if (specifications !== null && specifications !== undefined) {
-      formatter = NumberFormatter.build(specifications);
+      formatters[$el.data('slider-id')] = NumberFormatter.build(specifications);
     }
 
     displayLabelBlock(
+      $el.data('slider-id'),
       $(`#facet_label_${$el.data('slider-id')}`),
       values === null ? $el.data('slider-min') : values[0],
       values === null ? $el.data('slider-max') : values[1],
@@ -69,7 +70,7 @@ const refreshSliders = () => {
         values === null ? $el.data('slider-min') : values[0],
         values === null ? $el.data('slider-max') : values[1],
       ],
-      change(event, ui) {
+      stop(event, ui) {
         const nextEncodedFacetsURL = $el.data('slider-encoded-url');
         const urlsSplitted = nextEncodedFacetsURL.split('?');
         let queryParams = [];
@@ -120,6 +121,7 @@ const refreshSliders = () => {
       },
       slide(event, ui) {
         displayLabelBlock(
+          $el.data('slider-id'),
           $(`#facet_label_${$el.data('slider-id')}`),
           ui.values[0],
           ui.values[1],

composer.json

@@ -16,7 +16,8 @@
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.14",
     "phpunit/phpunit": "~5.7",
-    "prestashop/php-coding-standards": "dev-master"
+    "prestashop/php-coding-standards": "dev-master",
+    "mockery/mockery": "^1.2"
   },
   "config": {
     "platform": {

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_facetedsearch</name>
     <displayName><![CDATA[Faceted search]]></displayName>
-    <version><![CDATA[3.0.2]]></version>
+    <version><![CDATA[3.0.3]]></version>
     <description><![CDATA[Displays a block allowing multiple filters.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>