Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8696 from franticpsyx/animate-variations-changes 

[2.4] Animate variations script DOM modifications
This commit is contained in:
Mike Jolley 2015-07-31 12:44:18 +01:00
parent 82f50cedb0 f5691fd82a
commit 67788f971d
2 changed files with 73 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
assets/js/frontend/add-to-cart-variation.js
View File

@ -48,7 +48,7 @@
$el.text( $el.attr( 'data-' + data_attribute ) );
}
});
$form.find( '.woocommerce-variation-description' ).remove();
$form.wc_variations_description_update( '' );
$form.trigger( 'reset_image' );
$form.find( '.single_variation_wrap' ).slideUp( 200 ).trigger( 'hide_variation' );
} )
@ -165,7 +165,6 @@
variation_caption = variation.image_caption,
variation_title = variation.image_title;
$form.find( '.variations_button' ).show();
$form.find( '.single_variation' ).html( variation.price_html + variation.availability_html );
if ( o_src === undefined ) {
@ -241,10 +240,11 @@
$dimensions.text( $dimensions.attr( 'data-o_dimensions' ) );
}
$single_variation_wrap.find( '.quantity' ).show();
var hide_qty = false;
var hide_qty_button = false;
if ( ! variation.is_purchasable || ! variation.is_in_stock || ! variation.variation_is_visible ) {
$form.find( '.variations_button' ).hide();
hide_qty_button = true;
}
if ( ! variation.variation_is_visible ) {
@ -265,16 +265,37 @@
if ( variation.is_sold_individually === 'yes' ) {
$single_variation_wrap.find( '.quantity input.qty' ).val( '1' );
hide_qty = true;
}
// Show/hide qty container
if ( hide_qty ) {
$single_variation_wrap.find( '.quantity' ).hide();
} else {
// No need to hide it when hiding its container
if ( ! hide_qty_button ) {
$single_variation_wrap.find( '.quantity' ).show();
}
}
// display variation description
$form.find( '.woocommerce-variation-description' ).remove();
if ( variation.variation_description ) {
$form.find( '.single_variation_wrap' ).prepend( '<div class="woocommerce-variation-description">' + variation.variation_description + '</div>' );
// Show/hide qty & button container
if ( hide_qty_button ) {
if ( $single_variation_wrap.is( ':visible' ) ) {
$form.find( '.variations_button' ).slideUp( 200 );
} else {
$form.find( '.variations_button' ).hide();
}
} else {
if ( $single_variation_wrap.is( ':visible' ) ) {
$form.find( '.variations_button' ).slideDown( 200 );
} else {
$form.find( '.variations_button' ).show();
}
}
// Refresh variation description
$form.wc_variations_description_update( variation.variation_description );
$single_variation_wrap.slideDown( 200 ).trigger( 'show_variation', [ variation ] );
})
@ -469,6 +490,48 @@
}
};
/**
* Performs animated variation description refreshes
*/
$.fn.wc_variations_description_update = function( variation_description ) {
var $form = this;
var $variations_description = $form.find( '.woocommerce-variation-description' );
if ( $variations_description.length === 0 ) {
if ( variation_description ) {
// add transparent border to allow correct height measurement when children have top/bottom margins
$form.find( '.single_variation_wrap' ).prepend( $( '<div class="woocommerce-variation-description" style="border:1px solid transparent;">' + variation_description + '</div>' ).hide() );
$form.find( '.woocommerce-variation-description' ).slideDown( 200 );
}
} else {
var load_height = $variations_description.outerHeight( true );
var new_height = 0;
var animate_height = false;
// lock height
$variations_description.css( 'height', load_height );
// replace html
$variations_description.html( variation_description );
// measure height
$variations_description.css( 'height', 'auto' );
new_height = $variations_description.outerHeight( true );
if ( Math.abs( new_height - load_height ) > 1 ) {
animate_height = true;
// lock height
$variations_description.css( 'height', load_height );
}
// animate height
if ( animate_height ) {
$variations_description.animate( { 'height' : new_height }, { duration: 200, queue: false, always: function() {
$variations_description.css( { 'height' : 'auto' } );
} } );
}
}
};
$( function() {
if ( typeof wc_add_to_cart_variation_params !== 'undefined' ) {
$( '.variations_form' ).each( function() {

2
assets/js/frontend/add-to-cart-variation.min.js vendored
View File

File diff suppressed because one or more lines are too long