better variable handling

better image in content check
This commit is contained in:
Robin Cornett
2014-11-06 15:56:48 -05:00
parent 618d2ec3e6
commit 16a6f9dca1
2 changed files with 31 additions and 22 deletions
@@ -36,16 +36,16 @@ class Display_Featured_Image_Genesis_Output {
public function load_scripts() {
$item = Display_Featured_Image_Genesis_Common::get_image_variables();
if ( ( ! empty( $item->original ) && false === $item->content ) || ( ! is_singular() && ! empty( $item->original ) ) ) {
if ( ( ! empty( $item->backstretch ) && false === $item->content ) || ( ! is_singular() && ! empty( $item->backstretch ) ) ) {
wp_enqueue_style( 'displayfeaturedimage-style', plugins_url( 'includes/css/display-featured-image-genesis.css', dirname( __FILE__ ) ), array(), 1.0 );
if ( $item->original[1] > $item->large ) {
if ( $item->backstretch[1] > $item->large ) {
wp_enqueue_script( 'displayfeaturedimage-backstretch', plugins_url( '/includes/js/backstretch.js', dirname( __FILE__ ) ), array( 'jquery' ), '1.0.0' );
wp_enqueue_script( 'displayfeaturedimage-backstretch-set', plugins_url( '/includes/js/backstretch-set.js', dirname( __FILE__ ) ), array( 'jquery', 'displayfeaturedimage-backstretch' ), '1.0.0' );
wp_localize_script( 'displayfeaturedimage-backstretch-set', 'BackStretchVars', array(
'src' => esc_url( $item->original[0] ),
'src' => esc_url( $item->backstretch[0] ),
'height' => esc_attr( $item->reduce )
) );
@@ -53,7 +53,7 @@ class Display_Featured_Image_Genesis_Output {
}
elseif ( ( $item->original[1] <= $item->large ) && ( $item->original[1] > $item->medium ) ) {
elseif ( ( $item->backstretch[1] <= $item->large ) && ( $item->backstretch[1] > $item->medium ) ) {
add_action( 'genesis_before_entry', array( $this, 'do_large_image' ) ); // HTML5
add_action( 'genesis_before_post', array( $this, 'do_large_image' ) ); // XHTML
}
@@ -71,11 +71,11 @@ class Display_Featured_Image_Genesis_Output {
$item = Display_Featured_Image_Genesis_Common::get_image_variables();
if ( ( ! empty( $item->original ) && false === $item->content ) || ( ! is_singular() && ! empty( $item->original ) ) ) {
if ( $item->original[1] > $item->large ) {
if ( ( ! empty( $item->backstretch ) && false === $item->content ) || ( ! is_singular() && ! empty( $item->backstretch ) ) ) {
if ( $item->backstretch[1] > $item->large ) {
$classes[] = 'has-leader';
}
elseif ( ( $item->original[1] <= $item->large ) && ( $item->original[1] > $item->medium ) ) {
elseif ( ( $item->backstretch[1] <= $item->large ) && ( $item->backstretch[1] > $item->medium ) ) {
$classes[] = 'large-featured';
}
}