From e1784a02af9fda19bd20da71c5ab0ed5c29c287e Mon Sep 17 00:00:00 2001 From: Robin Cornett Date: Tue, 14 May 2019 13:42:34 -0400 Subject: [PATCH] Rearrange output/meta files --- display-featured-image-genesis.php | 10 +++---- ...ass-displayfeaturedimagegenesis-author.php | 0 ...s-displayfeaturedimagegenesis-postmeta.php | 0 ...displayfeaturedimagegenesis-taxonomies.php | 0 ...isplayfeaturedimagegenesis-description.php | 0 ...ss-displayfeaturedimagegenesis-enqueue.php | 28 +++++++++++++------ ...ass-displayfeaturedimagegenesis-output.php | 0 .../class-displayfeaturedimagegenesis-rss.php | 0 8 files changed, 25 insertions(+), 13 deletions(-) rename includes/{ => meta}/class-displayfeaturedimagegenesis-author.php (100%) rename includes/{ => meta}/class-displayfeaturedimagegenesis-postmeta.php (100%) rename includes/{ => meta}/class-displayfeaturedimagegenesis-taxonomies.php (100%) rename includes/{ => output}/class-displayfeaturedimagegenesis-description.php (100%) rename includes/{ => output}/class-displayfeaturedimagegenesis-enqueue.php (89%) rename includes/{ => output}/class-displayfeaturedimagegenesis-output.php (100%) rename includes/{ => output}/class-displayfeaturedimagegenesis-rss.php (100%) diff --git a/display-featured-image-genesis.php b/display-featured-image-genesis.php index ba2fcd6..d8a54bd 100644 --- a/display-featured-image-genesis.php +++ b/display-featured-image-genesis.php @@ -35,14 +35,14 @@ function display_featured_image_genesis_require() { 'settings/class-displayfeaturedimagegenesis-getsetting', 'settings/class-displayfeaturedimagegenesis-helper', 'class-displayfeaturedimagegenesis-admin', - 'class-displayfeaturedimagegenesis-author', 'class-displayfeaturedimagegenesis-common', - 'class-displayfeaturedimagegenesis-output', - 'class-displayfeaturedimagegenesis-postmeta', - 'class-displayfeaturedimagegenesis-rss', + 'meta/class-displayfeaturedimagegenesis-author', + 'meta/class-displayfeaturedimagegenesis-postmeta', + 'meta/class-displayfeaturedimagegenesis-taxonomies', + 'output/class-displayfeaturedimagegenesis-output', + 'output/class-displayfeaturedimagegenesis-rss', 'settings/class-displayfeaturedimagegenesis-settings', 'settings/class-displayfeaturedimagegenesis-customizer', - 'class-displayfeaturedimagegenesis-taxonomies', 'sixtenpress-shortcodes/sixtenpress-shortcodes', 'widgets/class-displayfeaturedimagegenesis-widgets', ); diff --git a/includes/class-displayfeaturedimagegenesis-author.php b/includes/meta/class-displayfeaturedimagegenesis-author.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-author.php rename to includes/meta/class-displayfeaturedimagegenesis-author.php diff --git a/includes/class-displayfeaturedimagegenesis-postmeta.php b/includes/meta/class-displayfeaturedimagegenesis-postmeta.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-postmeta.php rename to includes/meta/class-displayfeaturedimagegenesis-postmeta.php diff --git a/includes/class-displayfeaturedimagegenesis-taxonomies.php b/includes/meta/class-displayfeaturedimagegenesis-taxonomies.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-taxonomies.php rename to includes/meta/class-displayfeaturedimagegenesis-taxonomies.php diff --git a/includes/class-displayfeaturedimagegenesis-description.php b/includes/output/class-displayfeaturedimagegenesis-description.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-description.php rename to includes/output/class-displayfeaturedimagegenesis-description.php diff --git a/includes/class-displayfeaturedimagegenesis-enqueue.php b/includes/output/class-displayfeaturedimagegenesis-enqueue.php similarity index 89% rename from includes/class-displayfeaturedimagegenesis-enqueue.php rename to includes/output/class-displayfeaturedimagegenesis-enqueue.php index 0901ed0..9a11063 100644 --- a/includes/class-displayfeaturedimagegenesis-enqueue.php +++ b/includes/output/class-displayfeaturedimagegenesis-enqueue.php @@ -86,11 +86,30 @@ class DisplayFeaturedImageGenesisEnqueue { ) ); + $image_id = Display_Featured_Image_Genesis_Common::set_image_id(); + $output = array( + 'height' => (int) $this->setting['less_header'], + 'alignX' => $backstretch_vars['centeredX'], + 'alignY' => $backstretch_vars['centeredY'], + 'fade' => (int) $backstretch_vars['fade'], + 'title' => esc_attr( $this->get_image_alt_text( $image_id ) ), + ); + + wp_localize_script( 'displayfeaturedimage-backstretch-set', 'BackStretchVars', array_merge( $this->localize_sizes(), $output ) ); + } + + /** + * Get the size related localization data. + * @return array + * @since 3.1.0 + */ + private function localize_sizes() { $image_id = Display_Featured_Image_Genesis_Common::set_image_id(); $large = wp_get_attachment_image_src( $image_id, 'large' ); $medium_large = wp_get_attachment_image_src( $image_id, 'medium_large' ); $responsive = apply_filters( 'displayfeaturedimagegenesis_responsive_backstretch', true ); - $output = array( + + return array( 'source' => array( 'backstretch' => esc_url( $this->item->backstretch[0] ), 'large' => $large[3] && $responsive ? esc_url( $large[0] ) : '', @@ -106,14 +125,7 @@ class DisplayFeaturedImageGenesisEnqueue { 'large' => $large[3] ? $large[2] : '', 'medium_large' => $medium_large[3] ? $medium_large[2] : '', ), - 'height' => (int) $this->setting['less_header'], - 'alignX' => $backstretch_vars['centeredX'], - 'alignY' => $backstretch_vars['centeredY'], - 'fade' => (int) $backstretch_vars['fade'], - 'title' => esc_attr( $this->get_image_alt_text( $image_id ) ), ); - - wp_localize_script( 'displayfeaturedimage-backstretch-set', 'BackStretchVars', $output ); } /** diff --git a/includes/class-displayfeaturedimagegenesis-output.php b/includes/output/class-displayfeaturedimagegenesis-output.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-output.php rename to includes/output/class-displayfeaturedimagegenesis-output.php diff --git a/includes/class-displayfeaturedimagegenesis-rss.php b/includes/output/class-displayfeaturedimagegenesis-rss.php similarity index 100% rename from includes/class-displayfeaturedimagegenesis-rss.php rename to includes/output/class-displayfeaturedimagegenesis-rss.php