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

No need to wrap - leave styling to themes

This commit is contained in:
Mike Jolley 2017-04-27 18:03:42 +01:00
parent 7c8c17d284
commit ad578137be
3 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/css/woocommerce-layout.scss
View File

@ -348,19 +348,6 @@
*/
.woocommerce-oembed {
position: relative;
&.force-ratio {
width: 100%;
height: 0;
embed, iframe, object, video {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
}
}
}

36
includes/wc-formatting-functions.php
View File

@ -1045,48 +1045,14 @@ function wc_format_datetime( $date, $format = '' ) {
/**
* Process oEmbeds.
*
* @since 3.0.0
* @since 3.1.0
* @param string $content
* @return string
*/
function wc_do_oembeds( $content ) {
global $wp_embed;
$layout_css_enqueued = wp_style_is( 'woocommerce-layout', 'enqueued' );
if ( $layout_css_enqueued ) {
add_filter( 'embed_oembed_html', 'wc_wrap_oembed' );
}
$content = $wp_embed->autoembed( $content );
if ( $layout_css_enqueued ) {
remove_filter( 'embed_oembed_html', 'wc_wrap_oembed' );
}
return $content;
}
/**
* Wrap an oEmbed with a container that keeps the ratio in narrow containers.
*
* @since 3.0.0
* @param string $html oEmbed html (generally an iframe)
* @return string
*/
function wc_wrap_oembed( $html ) {
$classes = array( 'woocommerce-oembed' );
$width_regex = '/width="([0-9]+)/';
$height_regex = '/height="([0-9]+)/';
$width = preg_match( $width_regex, $html, $matches ) ? (int) $matches[1] : 0;
$height = preg_match( $height_regex, $html, $matches ) ? (int) $matches[1] : 0;
$padding_bottom_percent = ( $width && $height && $width > $height ) ? round( $height / $width, 2 ) * 100 : 0;
if ( $padding_bottom_percent ) {
$classes[] = 'force-ratio';
}
$html = '<div class="' . implode( ' ', $classes ) . '" style="padding-bottom: ' . $padding_bottom_percent . '%">' . $html . '</div>';
return $html;
}

17
tests/unit-tests/formatting/functions.php
View File

@ -644,21 +644,4 @@ class WC_Tests_Formatting_Functions extends WC_Unit_Test_Case {
$this->assertEquals( 'st.', wc_trim_string( 'string', 3, '.' ) );
$this->assertEquals( 'string¥', wc_trim_string( 'string¥', 7, '' ) );
}
/**
* Test wc_wrap_oembed().
*
* @since 3.0.0
*/
public function test_wc_wrap_oembed() {
$ratio_html = '<iframe width="625" height="352" src="https://www.youtube.com/embed/1KahlicghaE?feature=oembed" frameborder="0" allowfullscreen></iframe>';
$natural_html = '<blockquote class="twitter-tweet" data-width="550"><p lang="en" dir="ltr">Apple Pay is now available for <a href="https://twitter.com/hashtag/WooCommerce?src=hash">#WooCommerce</a>. Quicker checkouts for your<br>customers, better conversion rates for you: <a href="https://t.co/89zhGGZlhS">https://t.co/89zhGGZlhS</a> <a href="https://t.co/oFh11vQsAJ">pic.twitter.com/oFh11vQsAJ</a></p>&mdash; WooCommerce (@WooCommerce) <a href="https://twitter.com/WooCommerce/status/842406075374698497">March 16, 2017</a></blockquote><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
$ratio_html_expected = '<div class="woocommerce-oembed force-ratio" style="padding-bottom: 56%"><iframe width="625" height="352" src="https://www.youtube.com/embed/1KahlicghaE?feature=oembed" frameborder="0" allowfullscreen></iframe></div>';
$ratio_wrapped = wc_wrap_oembed( $ratio_html );
$natural_wrapped = wc_wrap_oembed( $natural_html );
$this->assertEquals( $ratio_html_expected, $ratio_wrapped );
$this->assertFalse( strpos( $natural_wrapped, 'force-ratio' ) );
}
}