git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10953 b9a71923-0436-4b27-9f14-aed3839534dd

This commit is contained in:
sThiebaut
2011-12-05 17:22:27 +00:00
parent 5b1642b26e
commit 6bea0782e9
7 changed files with 30 additions and 16 deletions
+3 -3
View File
@@ -306,7 +306,7 @@ function updateDisplay()
if (selectedCombination['specific_price'].reduction_type == 'percentage')
{
$('#reduction_amount').hide();
$('#reduction_percent_display').html('-' + selectedCombination['specific_price'].reduction*100 + '%');
$('#reduction_percent_display').html('-' + parseFloat(selectedCombination['specific_price'].reduction_percent) + '%');
$('#reduction_percent').show();
} else if (selectedCombination['specific_price'].reduction_type == 'amount') {
$('#reduction_percent').hide();
@@ -584,11 +584,11 @@ function checkMinimalQuantity(minimal_quantity)
function colorPickerClick(elt)
{
id_attribute = $(elt).attr('id').replace('color_', '');
$('.color_pick').removeClass('selected');
$('.color_pick').parent().removeClass('selected');
$(elt).fadeTo('fast', 1, function(){
$(this).fadeTo('slow', 0, function(){
$(this).fadeTo('slow', 1, function(){
$(this).addClass('selected');
$(this).parent().addClass('selected');
});
});
});