dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSFV-587 - product image cover does not change on product page

Browse Source
This commit is contained in:
vAugagneur
2012-03-06 15:00:41 +00:00
parent ff867b7d25
commit 34c8e1d647
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/product.js
+13 -15
View File
@@ -120,7 +120,7 @@ function findCombination(firstTime)
selectedCombination['ecotax'] = default_eco_tax; selectedCombination['ecotax'] = default_eco_tax;
//show the large image in relation to the selected combination //show the large image in relation to the selected combination
if (combinations[combination]['image'] && combinations[combination]['image'] != -1) if (typeof(firstTime) != 'undefined' && !firstTime && combinations[combination]['image'] && combinations[combination]['image'] != -1)
displayImage($('#thumb_'+combinations[combination]['image']).parent(), firstTime); displayImage($('#thumb_'+combinations[combination]['image']).parent(), firstTime);
//show discounts values according to the selected combination //show discounts values according to the selected combination
@@ -539,7 +539,6 @@ $(document).ready(function()
//position: "right" //zooming div position(default position value is "right") //position: "right" //zooming div position(default position value is "right")
}); });
} }
//add a link on the span 'view full size' and on the big image //add a link on the span 'view full size' and on the big image
$('span#view_full_size, div#image-block img').click(function(){ $('span#view_full_size, div#image-block img').click(function(){
$('#views_block li a.shown').click(); $('#views_block li a.shown').click();
@@ -562,10 +561,10 @@ $(document).ready(function()
//init the price in relation of the selected attributes //init the price in relation of the selected attributes
if (typeof productHasAttributes != 'undefined' && productHasAttributes) if (typeof productHasAttributes != 'undefined' && productHasAttributes)
findCombination(true); findCombination(true);
else if (typeof productHasAttributes != 'undefined' && !productHasAttributes) else if (typeof productHasAttributes != 'undefined' && !productHasAttributes)
refreshProductImages(0); refreshProductImages(0);
//
$('a#resetImages').click(function() { $('a#resetImages').click(function() {
refreshProductImages(0); refreshProductImages(0);
}); });
@@ -575,6 +574,12 @@ $(document).ready(function()
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
original_url = window.location+'';
first_url_check = true;
checkUrl();
initLocationChange();
}); });
function saveCustomization() function saveCustomization()
@@ -665,14 +670,14 @@ function colorPickerClick(elt)
id_attribute = $(elt).attr('id').replace('color_', ''); id_attribute = $(elt).attr('id').replace('color_', '');
$('.color_pick').parent().removeClass('selected'); $('.color_pick').parent().removeClass('selected');
$(elt).fadeTo('fast', 1, function(){ $(elt).fadeTo('fast', 1, function(){
$(this).fadeTo('slow', 0, function(){ $(this).fadeTo('fast', 0, function(){
$(this).fadeTo('slow', 1, function(){ $(this).fadeTo('fast', 1, function(){
$(this).parent().addClass('selected'); $(this).parent().addClass('selected');
}); });
}); });
}); });
$('#color_pick_hidden').val(id_attribute); $('#color_pick_hidden').val(id_attribute);
findCombination(); findCombination(false);
} }
@@ -704,13 +709,6 @@ function getProductAttribute()
window.location = url+request; window.location = url+request;
} }
$(document).ready(function(){
original_url = window.location+'';
first_url_check = true;
checkUrl();
initLocationChange();
});
function initLocationChange(time) function initLocationChange(time)
{ {
if(!time) time = 500; if(!time) time = 500;
@@ -753,7 +751,7 @@ function checkUrl()
// find combination // find combination
if (count > 0) if (count > 0)
{ {
findCombination(); findCombination(false);
original_url = window.location+''; original_url = window.location+'';
} }
// no combination found = removing attributes from url // no combination found = removing attributes from url
@@ -761,4 +759,4 @@ function checkUrl()
window.location = url.substring(0, url.indexOf('#')); window.location = url.substring(0, url.indexOf('#'));
} }
} }
} }