From 567c23dafc20600c5913d36fbfafbee02e58bf37 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 1 Dec 2011 15:49:13 +0000 Subject: [PATCH] // BugFix on blocklayered and sliders git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10836 b9a71923-0436-4b27-9f14-aed3839534dd --- modules/blocklayered/blocklayered.js | 8 ++++++-- modules/blocklayered/blocklayered.php | 4 ++-- modules/blocklayered/blocklayered.tpl | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js index 329b9aa89..53c3a4092 100644 --- a/modules/blocklayered/blocklayered.js +++ b/modules/blocklayered/blocklayered.js @@ -237,12 +237,16 @@ function openCloseFilter() }); } -function reloadContent(params_plus) -{ +function stopAjaxQuery() { for(i = 0; i < ajaxQueries.length; i++) ajaxQueries[i].abort(); ajaxQueries = new Array(); +} +function reloadContent(params_plus) +{ + stopAjaxQuery(); + if (!ajaxLoaderOn) { $('#product_list').prepend($('#layered_ajax_loader').html()); diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 36778b6cc..de686b139 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -2038,7 +2038,7 @@ class BlockLayered extends Module case 'price': if (isset($selectedFilters['price'])) { - if ($selectedFilters['price'][0] != 0 || $selectedFilters['price'][1] != 0) + if ($selectedFilters['price'][0] !== '' || $selectedFilters['price'][1] !== '') { $priceFilter = array(); $priceFilter['min'] = (float)($selectedFilters['price'][0]); @@ -2162,7 +2162,7 @@ class BlockLayered extends Module { case 'price': case 'weight': - if ($value[0] == '' && $value[1] == '') + if ($value[0] === '' && $value[1] === '') unset($selectedFilters[$key]); break; default: diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl index ae307663f..34e60b362 100644 --- a/modules/blocklayered/blocklayered.tpl +++ b/modules/blocklayered/blocklayered.tpl @@ -149,6 +149,7 @@ param_product_url = ''; max: {/literal}{$filter.max}{literal}, values: [ {/literal}{$filter.values[0]}{literal}, {/literal}{$filter.values[1]}{literal}], slide: function( event, ui ) { + stopAjaxQuery(); $('#layered_{/literal}{$filter.type}{literal}_range').html(ui.values[ 0 ] + '{/literal}{$filter.unit}{literal}' + ' - ' + ui.values[ 1 ] + '{/literal}{$filter.unit}{literal}'); }, stop: function () {