From e00d7e736f36113fec1ca3d5f1f4f5d1b0a8d0b4 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 21 Mar 2013 15:09:02 +0100 Subject: [PATCH] [-] FO : Fix bug #PSCFV-8202 special chars for checkCustomizations js function --- js/tools.js | 8 +++++--- modules/blockuserinfo/blockuserinfo.css | 1 - themes/default/modules/blockcart/blockcart.tpl | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/js/tools.js b/js/tools.js index c6fe64764..31aa17ccc 100644 --- a/js/tools.js +++ b/js/tools.js @@ -93,7 +93,7 @@ function ps_round(value, precision) return Math.round(value * precisionFactor) / precisionFactor; } -function autoUrl(name, dest) +function autoUrl(name, dest) { var loc; var id_list; @@ -105,7 +105,7 @@ function autoUrl(name, dest) return ; } -function autoUrlNoList(name, dest) +function autoUrlNoList(name, dest) { var loc; @@ -207,9 +207,11 @@ function checkCustomizations() if (typeof customizationFields != 'undefined') for (var i = 0; i < customizationFields.length; i++) + { /* If the field is required and empty then we abort */ - if (parseInt(customizationFields[i][1]) == 1 && ($('#' + customizationFields[i][0]).html() == '' || $('#' + customizationFields[i][0]).html() != $('#' + customizationFields[i][0]).val()) && !pattern.test($('#' + customizationFields[i][0]).attr('class'))) + if (parseInt(customizationFields[i][1]) == 1 && ($('#' + customizationFields[i][0]).html() == '' || $('#' + customizationFields[i][0]).text() != $('#' + customizationFields[i][0]).val()) && !pattern.test($('#' + customizationFields[i][0]).attr('class'))) return false; + } return true; } diff --git a/modules/blockuserinfo/blockuserinfo.css b/modules/blockuserinfo/blockuserinfo.css index 235a1b271..f44c05094 100644 --- a/modules/blockuserinfo/blockuserinfo.css +++ b/modules/blockuserinfo/blockuserinfo.css @@ -4,7 +4,6 @@ clear:both; float: right; margin-top:8px; - width: 535px; } #header_user #header_nav { diff --git a/themes/default/modules/blockcart/blockcart.tpl b/themes/default/modules/blockcart/blockcart.tpl index 654dead07..15b222a77 100644 --- a/themes/default/modules/blockcart/blockcart.tpl +++ b/themes/default/modules/blockcart/blockcart.tpl @@ -3,10 +3,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Academic Free License (AFL 3.0) +* This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php +* http://opensource.org/licenses/osl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -19,13 +19,13 @@ * * @author PrestaShop SA * @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{*************************************************************************************************************************************} + {* IMPORTANT : If you change some data here, you have to report these changes in the ./blockcart-json.js (to let ajaxCart available) *} -{*************************************************************************************************************************************} + {if $ajax_allowed}