From 784a41e1d7c039eb908b7ccc61578fc755a9ee10 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 18 Jun 2019 10:26:49 -0400
Subject: [PATCH 01/44] Initial (non-working) add

Some kind of REST 404 error but no idea how to resolve.
---
 ...ass-displayfeaturedimagegenesis-blocks.php | 257 ++++++++++++++++++
 .../class-displayfeaturedimagegenesis.php     |  10 +
 includes/js/block.js                          | 200 ++++++++++++++
 3 files changed, 467 insertions(+)
 create mode 100644 includes/blocks/class-displayfeaturedimagegenesis-blocks.php
 create mode 100644 includes/js/block.js

diff --git a/includes/blocks/class-displayfeaturedimagegenesis-blocks.php b/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
new file mode 100644
index 0000000..5d0b5ac
--- /dev/null
+++ b/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * Class DisplayFeaturedImageGenesisBlocks
+ */
+class DisplayFeaturedImageGenesisBlocks {
+
+	/**
+	 *
+	 */
+	public function init() {
+		$this->register_script_style();
+		foreach ( $this->blocks() as $block => $data ) {
+			if ( 'term' === $block ) {
+				continue;
+			}
+			register_block_type(
+				"display-featured-image-genesis/{$block}",
+				array(
+					'editor_script'   => 'displayfeaturedimagegenesis-block',
+					'attributes'      => $this->get_attributes( $block ),
+					'render_callback' => array( $this, 'render' ),
+				)
+			);
+		}
+		add_action( 'enqueue_block_editor_assets', array( $this, 'localize' ) );
+	}
+
+	/**
+	 * Register the block script and style.
+	 */
+	public function register_script_style() {
+		$version = displayfeaturedimagegenesis_get()->version;
+		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
+		if ( ! $minify ) {
+			$version .= current_time( 'gmt' );
+		}
+		wp_register_script(
+			'displayfeaturedimagegenesis-block',
+			plugin_dir_url( dirname( __FILE__ ) ) . "js/block{$minify}.js",
+			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
+			$version,
+			false
+		);
+	}
+
+	/**
+	 * Get the list of blocks to create.
+	 * @return array
+	 */
+	private function blocks() {
+		return array(
+			'term'      => array(
+				'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Term', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+			),
+			'author'    => array(
+				'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Author', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+			),
+			'post-type' => array(
+				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Post Type', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+			),
+		);
+	}
+
+	/**
+	 * Render the widget in a container div.
+	 *
+	 * @param $attributes
+	 *
+	 * @return string
+	 */
+	public function render( $attributes ) {
+		rgc_error_log( $attributes );
+//		$classes = $this->get_block_classes( $attributes );
+//		$output  = '<div class="' . implode( ' ', $classes ) . '">';
+////		$output .= $this->register->shortcode( $attributes );
+//		$output .= '</div>';
+
+		return 'this is the output';
+	}
+
+	/**
+	 * Get the block classes.
+	 *
+	 * @param $attributes
+	 *
+	 * @return array
+	 * @since 0.4.0
+	 */
+	private function get_block_classes( $attributes ) {
+		$classes = array(
+			'wp-block-displayfeaturedimagegenesis' . 'term',
+		);
+		if ( ! empty( $attributes['className'] ) ) {
+			$classes[] = $attributes['className'];
+		}
+		if ( ! empty( $attributes['blockAlignment'] ) ) {
+			$classes[] = 'align' . $attributes['blockAlignment'];
+		}
+
+		return $classes;
+	}
+
+	/**
+	 * @param $block
+	 *
+	 * @return array
+	 */
+	protected function get_attributes( $block ) {
+		$attributes = array_merge(
+			$this->fields(),
+			$this->get_block_fields( $block )
+		);
+		foreach ( $attributes as $key => $value ) {
+			$attributes[ $key ] = $this->get_individual_field_attributes( $value, $key );
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 *
+	 */
+	public function localize() {
+		$args = array();
+		foreach ( $this->blocks() as $block => $data ) {
+			$args['blocks'][ $block ] = $this->get_localization_data( $block, $data );
+		}
+		wp_localize_script( 'displayfeaturedimagegenesis-block', 'DisplayFeaturedImageGenesisBlock', $args );
+	}
+
+	/**
+	 * Get the data for localizing everything.
+	 * @return array
+	 */
+	protected function get_localization_data( $block, $data ) {
+		return array(
+			'block'       => "displayfeaturedimagegenesis/{$block}",
+			'title'       => $data['title'],
+			'description' => $data['description'],
+			'keywords'    => $data['keywords'],
+			'panels'      => array(
+				'main' => array(
+					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
+					'initialOpen' => true,
+					'attributes'  => $this->get_attributes( $block ),
+				),
+			),
+			'icon'        => 'format-image',
+			'category'    => 'widgets',
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	private function fields() {
+		return array(
+			'blockAlignment' => array(
+				'type'    => 'string',
+				'default' => '',
+			),
+			'className'      => array(
+				'type'    => 'string',
+				'default' => '',
+			),
+			'title'          => array(
+				'type'    => 'string',
+				'default' => '',
+				'label'   => __( 'Title', 'display-featured-image-genesis' ),
+			),
+			'show_image'     => array(
+				'type'    => 'boolean',
+				'default' => 1,
+				'label'   => __( 'Show Featured Image', 'display-featured-image-genesis' ),
+				'method'  => 'checkbox',
+			),
+			'image_size'     => array(
+				'type'    => 'string',
+				'default' => 'medium',
+				'label'   => __( 'Image Size:', 'display-featured-image-genesis' ),
+				'method'  => 'select',
+				'choices' => $this->get_image_size(),
+			),
+		);
+	}
+
+	/**
+	 * Get an array of attributes for an individual field.
+	 *
+	 * @param $field
+	 * @param $id
+	 *
+	 * @return array
+	 */
+	protected function get_individual_field_attributes( $field, $id ) {
+		$field_type = $field['type'];
+		if ( empty( $field['label'] ) ) {
+			return $field;
+		}
+		$attributes = array(
+			'type'    => $field['type'],
+			'default' => $field['default'],
+			'label'   => $field['label'],
+			'method'  => empty( $field['method'] ) ? 'text' : $field['method'],
+		);
+		if ( in_array( 'number', array( $field_type, $attributes['method'] ), true ) ) {
+			$attributes['min'] = $field['args']['min'];
+			$attributes['max'] = $field['args']['max'];
+		} elseif ( 'select' === $attributes['method'] ) {
+			foreach ( $field['choices'] as $value => $label ) {
+				$attributes['options'][] = array(
+					'value' => $value,
+					'label' => $label,
+				);
+			}
+		} elseif ( 'boolean' === $field_type ) {
+			$attributes['default'] = 0;
+		}
+
+		return $attributes;
+	}
+
+	private function get_image_size() {
+		$sizes   = genesis_get_image_sizes();
+		$options = array();
+		foreach ( (array) $sizes as $name => $size ) {
+			$options[ $name ] = sprintf( '%s ( %s x %s )', esc_html( $name ), (int) $size['width'], (int) $size['height'] );
+		}
+
+		return $options;
+	}
+
+	/**
+	 * @param $block
+	 *
+	 * @return array
+	 */
+	private function get_block_fields( $block ) {
+		return array();
+	}
+}
diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index 1a7c1a5..82fb952 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -125,6 +125,7 @@ class Display_Featured_Image_Genesis {
 		add_action( 'widgets_init', array( $this->widgets, 'register_widgets' ) );
 		add_action( 'widgets_init', array( $this->widgets, 'register_shortcodes' ) );
 		add_action( 'admin_enqueue_scripts', array( $this->widgets, 'enqueue_scripts' ) );
+		add_action( 'init', array( $this, 'maybe_register_block' ) );
 
 		// Taxonomies, Authors
 		add_filter( 'displayfeaturedimagegenesis_get_taxonomies', array( $this->taxonomies, 'remove_post_status_terms' ) );
@@ -249,6 +250,15 @@ class Display_Featured_Image_Genesis {
 		}
 	}
 
+	public function maybe_register_block() {
+		if ( ! function_exists( 'register_block_type' ) ) {
+			return;
+		}
+		include_once 'blocks/class-displayfeaturedimagegenesis-blocks.php';
+		$blocks = new DisplayFeaturedImageGenesisBlocks();
+		$blocks->init();
+	}
+
 	/**
 	 * Add link to plugin settings page in plugin table
 	 * @param $links array link to settings page
diff --git a/includes/js/block.js b/includes/js/block.js
new file mode 100644
index 0000000..43e2a5c
--- /dev/null
+++ b/includes/js/block.js
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2019 Robin Cornett
+ */
+
+(function ( wp, undefined ) {
+	'use strict';
+	const DisplayFeaturedImageBlockObject = {
+		el: wp.element.createElement,
+	};
+
+	/**
+	 * Initialize and register the block.
+	 */
+	DisplayFeaturedImageBlockObject.init = function () {
+		const registerBlockType = wp.blocks.registerBlockType,
+		      ServerSideRender  = wp.components.ServerSideRender,
+		      InspectorControls = wp.blockEditor.InspectorControls;
+		Object.keys( DisplayFeaturedImageBlockObject.params.blocks ).forEach( function ( key, index ) {
+			if ( DisplayFeaturedImageBlockObject.params.blocks.hasOwnProperty( key ) ) {
+				const data = DisplayFeaturedImageBlockObject.params.blocks[key];
+				registerBlockType( data.block, {
+					title: data.title,
+					description: data.description,
+					keywords: data.keywords,
+					icon: data.icon,
+					category: data.category,
+					supports: {
+						html: false
+					},
+
+					getEditWrapperProps( {blockAlignment} ) {
+						return {'data-align': blockAlignment};
+					},
+
+					edit: props => {
+						const {
+							      attributes,
+							      setAttributes
+						      }                     = props,
+						      Fragment              = wp.element.Fragment,
+						      BlockControls         = wp.blockEditor.BlockControls,
+						      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
+						return [
+							DisplayFeaturedImageBlockObject.el( ServerSideRender, {
+								block: data.block,
+								attributes: attributes
+							} ),
+							DisplayFeaturedImageBlockObject.el( Fragment, null,
+								DisplayFeaturedImageBlockObject.el( BlockControls, null,
+									DisplayFeaturedImageBlockObject.el( BlockAlignmentToolbar, {
+										value: attributes.blockAlignment,
+										controls: ['wide', 'full'],
+										onChange: ( value ) => {
+											setAttributes( {blockAlignment: value} );
+										},
+									} )
+								),
+							),
+							DisplayFeaturedImageBlockObject.el( InspectorControls, {},
+								_getPanels( props )
+							)
+						];
+					},
+
+					save: props => {
+						return null;
+					},
+				} );
+			}
+		} );
+	};
+
+	/**
+	 * Get the panels for the block controls.
+	 *
+	 * @param props
+	 * @return {Array}
+	 * @private
+	 */
+	function _getPanels( props ) {
+		const panels    = [],
+		      PanelBody = wp.components.PanelBody;
+		Object.keys( DisplayFeaturedImageBlockObject.params.blocks ).forEach( function ( block_key, index ) {
+			if ( DisplayFeaturedImageBlockObject.params.blocks.hasOwnProperty( block_key ) ) {
+				const data = DisplayFeaturedImageBlockObject.params.blocks[ block_key ];
+				Object.keys( data.panels ).forEach( function ( key, index ) {
+					if ( data.panels.hasOwnProperty( key ) ) {
+						const IndividualPanel = data.panels[key];
+						panels[index] = DisplayFeaturedImageBlockObject.el( PanelBody, {
+							title: IndividualPanel.title,
+							initialOpen: IndividualPanel.initialOpen,
+							className: 'display-featured-image-panel-' + key
+						}, _getControls( props, IndividualPanel.attributes ) );
+					}
+				} );
+			}
+		} );
+
+		return panels;
+	}
+
+	/**
+	 * Get all of the block controls, with defaults and options.
+	 *
+	 * @param props
+	 * @param fields
+	 * @return {Array}
+	 * @private
+	 */
+	function _getControls( props, fields ) {
+		const controls = [];
+		Object.keys( fields ).forEach( function ( key, index ) {
+			if ( fields.hasOwnProperty( key ) ) {
+				var skipped = [ 'blockAlignment', 'className' ];
+				if ( -1 !== skipped.indexOf( key ) ) {
+					return;
+				}
+				const IndividualField = fields[key],
+				      control         = _getControlType( IndividualField.method, IndividualField.type );
+				controls[index] = DisplayFeaturedImageBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
+			}
+		} );
+
+		return controls;
+	}
+
+	/**
+	 * Get the control type.
+	 * @param method
+	 * @param control_type
+	 * @return {*}
+	 * @private
+	 */
+	function _getControlType( method, control_type ) {
+		const {
+			      TextControl,
+			      SelectControl,
+			      RangeControl,
+			      CheckboxControl,
+			      TextareaControl
+		      } = wp.components;
+		const control = TextControl;
+		if ( 'select' === method ) {
+			return SelectControl;
+		} else if ( 'number' === method && 'number' === control_type ) {
+			return RangeControl;
+		} else if ( 'checkbox' === method ) {
+			return CheckboxControl;
+		} else if ( 'textarea' === method ) {
+			return TextareaControl;
+		}
+
+		return control;
+	}
+
+	/**
+	 * Build the individual control object. Sets up standard properties for all
+	 * controls; then adds custom properties as needed.
+	 *
+	 * @param key
+	 * @param field
+	 * @param props
+	 * @return {{label: *, value: *, className: string, onChange: onChange}}
+	 * @private
+	 */
+	function _getIndividualControl( key, field, props ) {
+		const {attributes, setAttributes} = props;
+		const control = {
+			heading: field.heading,
+			label: field.label,
+			value: attributes[key],
+			className: 'displayfeaturedimagegenesis-' + key,
+			onChange: ( value ) => {
+				setAttributes( {[key]: value} );
+			}
+		};
+
+		if ( 'select' === field.method ) {
+			control.options = field.options;
+		} else if ( 'number' === field.method ) {
+			control.min = field.min;
+			control.max = field.max;
+			if ( 'number' !== field.type ) {
+				control.type = 'number';
+			} else {
+				control.initialPosition = field.min;
+			}
+		} else if ( 'checkbox' === field.method ) {
+			control.checked = attributes[key];
+		}
+
+		return control;
+	}
+
+	DisplayFeaturedImageBlockObject.params = typeof DisplayFeaturedImageGenesisBlock === 'undefined' ? '' : DisplayFeaturedImageGenesisBlock;
+
+	if ( typeof DisplayFeaturedImageBlockObject.params !== 'undefined' ) {
+		DisplayFeaturedImageBlockObject.init();
+	}
+} )( wp );

From 51ae95ce2801621d2858910b3eafc649afc99403 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Fri, 21 Jun 2019 08:45:18 -0400
Subject: [PATCH 02/44] Chnage block registration (still REST 404)

---
 ...ass-displayfeaturedimagegenesis-blocks.php |   6 +-
 includes/js/block.js                          | 126 ++++++++----------
 includes/js/block.min.js                      |   1 +
 3 files changed, 64 insertions(+), 69 deletions(-)
 create mode 100644 includes/js/block.min.js

diff --git a/includes/blocks/class-displayfeaturedimagegenesis-blocks.php b/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
index 5d0b5ac..2de54ca 100644
--- a/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
+++ b/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
@@ -139,13 +139,17 @@ class DisplayFeaturedImageGenesisBlocks {
 	public function localize() {
 		$args = array();
 		foreach ( $this->blocks() as $block => $data ) {
-			$args['blocks'][ $block ] = $this->get_localization_data( $block, $data );
+			$args[ $block ] = $this->get_localization_data( $block, $data );
 		}
 		wp_localize_script( 'displayfeaturedimagegenesis-block', 'DisplayFeaturedImageGenesisBlock', $args );
 	}
 
 	/**
 	 * Get the data for localizing everything.
+	 *
+	 * @param $block
+	 * @param $data
+	 *
 	 * @return array
 	 */
 	protected function get_localization_data( $block, $data ) {
diff --git a/includes/js/block.js b/includes/js/block.js
index 43e2a5c..1dd7b11 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -8,65 +8,59 @@
 		el: wp.element.createElement,
 	};
 
-	/**
-	 * Initialize and register the block.
-	 */
-	DisplayFeaturedImageBlockObject.init = function () {
+	DisplayFeaturedImageBlockObject.takeTwo = function ( block ) {
 		const registerBlockType = wp.blocks.registerBlockType,
 		      ServerSideRender  = wp.components.ServerSideRender,
 		      InspectorControls = wp.blockEditor.InspectorControls;
-		Object.keys( DisplayFeaturedImageBlockObject.params.blocks ).forEach( function ( key, index ) {
-			if ( DisplayFeaturedImageBlockObject.params.blocks.hasOwnProperty( key ) ) {
-				const data = DisplayFeaturedImageBlockObject.params.blocks[key];
-				registerBlockType( data.block, {
-					title: data.title,
-					description: data.description,
-					keywords: data.keywords,
-					icon: data.icon,
-					category: data.category,
-					supports: {
-						html: false
-					},
+		const data = DisplayFeaturedImageBlockObject.params[block];
+		// console.log( data );
+		registerBlockType( data.block, {
+			title: data.title,
+			description: data.description,
+			keywords: data.keywords,
+			icon: data.icon,
+			category: data.category,
+			supports: {
+				html: false
+			},
 
-					getEditWrapperProps( {blockAlignment} ) {
-						return {'data-align': blockAlignment};
-					},
+			getEditWrapperProps( {blockAlignment} ) {
+				return {'data-align': blockAlignment};
+			},
 
-					edit: props => {
-						const {
-							      attributes,
-							      setAttributes
-						      }                     = props,
-						      Fragment              = wp.element.Fragment,
-						      BlockControls         = wp.blockEditor.BlockControls,
-						      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
-						return [
-							DisplayFeaturedImageBlockObject.el( ServerSideRender, {
-								block: data.block,
-								attributes: attributes
-							} ),
-							DisplayFeaturedImageBlockObject.el( Fragment, null,
-								DisplayFeaturedImageBlockObject.el( BlockControls, null,
-									DisplayFeaturedImageBlockObject.el( BlockAlignmentToolbar, {
-										value: attributes.blockAlignment,
-										controls: ['wide', 'full'],
-										onChange: ( value ) => {
-											setAttributes( {blockAlignment: value} );
-										},
-									} )
-								),
-							),
-							DisplayFeaturedImageBlockObject.el( InspectorControls, {},
-								_getPanels( props )
-							)
-						];
-					},
+			edit: props => {
+				const {
+					      attributes,
+					      setAttributes
+				      }                     = props,
+				      Fragment              = wp.element.Fragment,
+				      BlockControls         = wp.blockEditor.BlockControls,
+				      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
+				return [
+					DisplayFeaturedImageBlockObject.el( ServerSideRender, {
+						block: data.block,
+						attributes: data.attributes
+					} ),
+					DisplayFeaturedImageBlockObject.el( Fragment, null,
+						DisplayFeaturedImageBlockObject.el( BlockControls, null,
+							DisplayFeaturedImageBlockObject.el( BlockAlignmentToolbar, {
+								value: props.attributes.blockAlignment,
+								controls: ['wide', 'full'],
+								onChange: ( value ) => {
+									setAttributes( {blockAlignment: value} );
+								},
+							} )
+						),
+					),
+					DisplayFeaturedImageBlockObject.el( InspectorControls, {},
+						_getPanels( props, block )
+					)
+				];
+			},
 
-					save: props => {
-						return null;
-					},
-				} );
-			}
+			save: props => {
+				return null;
+			},
 		} );
 	};
 
@@ -74,25 +68,21 @@
 	 * Get the panels for the block controls.
 	 *
 	 * @param props
+	 * @param block
 	 * @return {Array}
 	 * @private
 	 */
-	function _getPanels( props ) {
+	function _getPanels( props, block ) {
 		const panels    = [],
 		      PanelBody = wp.components.PanelBody;
-		Object.keys( DisplayFeaturedImageBlockObject.params.blocks ).forEach( function ( block_key, index ) {
-			if ( DisplayFeaturedImageBlockObject.params.blocks.hasOwnProperty( block_key ) ) {
-				const data = DisplayFeaturedImageBlockObject.params.blocks[ block_key ];
-				Object.keys( data.panels ).forEach( function ( key, index ) {
-					if ( data.panels.hasOwnProperty( key ) ) {
-						const IndividualPanel = data.panels[key];
-						panels[index] = DisplayFeaturedImageBlockObject.el( PanelBody, {
-							title: IndividualPanel.title,
-							initialOpen: IndividualPanel.initialOpen,
-							className: 'display-featured-image-panel-' + key
-						}, _getControls( props, IndividualPanel.attributes ) );
-					}
-				} );
+		const blockData = DisplayFeaturedImageBlockObject.params[block];
+		Object.keys( blockData.panels ).forEach( function ( key, index ) {
+			if ( blockData.panels.hasOwnProperty( key ) ) {
+				const IndividualPanel = blockData.panels[key];
+				panels[index] = DisplayFeaturedImageBlockObject.el( PanelBody, {
+					title: IndividualPanel.title,
+					initialOpen: IndividualPanel.initialOpen
+				}, _getControls( props, IndividualPanel.attributes ) );
 			}
 		} );
 
@@ -195,6 +185,6 @@
 	DisplayFeaturedImageBlockObject.params = typeof DisplayFeaturedImageGenesisBlock === 'undefined' ? '' : DisplayFeaturedImageGenesisBlock;
 
 	if ( typeof DisplayFeaturedImageBlockObject.params !== 'undefined' ) {
-		DisplayFeaturedImageBlockObject.init();
+		DisplayFeaturedImageBlockObject.takeTwo( 'post-type' );
 	}
 } )( wp );
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
new file mode 100644
index 0000000..e396e57
--- /dev/null
+++ b/includes/js/block.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";const n={el:e.element.createElement};n.takeTwo=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,i=e.blockEditor.InspectorControls,r=n.params[t];o(r.block,{title:r.title,description:r.description,keywords:r.keywords,icon:r.icon,category:r.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:s,setAttributes:a}=o,c=e.element.Fragment,u=e.blockEditor.BlockControls,m=e.blockEditor.BlockAlignmentToolbar;return[n.el(l,{block:r.block,attributes:r.attributes}),n.el(c,null,n.el(u,null,n.el(m,{value:o.attributes.blockAlignment,controls:["wide","full"],onChange:e=>{a({blockAlignment:e})}}))),n.el(i,{},function(t,o){const l=[],i=e.components.PanelBody,r=n.params[o];return Object.keys(r.panels).forEach(function(o,s){if(r.panels.hasOwnProperty(o)){const a=r.panels[o];l[s]=n.el(i,{title:a.title,initialOpen:a.initialOpen},function(t,o){const l=[];return Object.keys(o).forEach(function(i,r){if(o.hasOwnProperty(i)){if(-1!==["blockAlignment","className"].indexOf(i))return;const s=o[i],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:i,CheckboxControl:r,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?s:a}(s.method,s.type);l[r]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,i={heading:t.heading,label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?i.options=t.options:"number"===t.method?(i.min=t.min,i.max=t.max,"number"!==t.type?i.type="number":i.initialPosition=t.min):"checkbox"===t.method&&(i.checked=o[e]),i}(i,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageGenesisBlock?"":DisplayFeaturedImageGenesisBlock,void 0!==n.params&&n.takeTwo("post-type")}(wp);
\ No newline at end of file

From f0451a1184f13d1ff844c0aa4a5513f83495aaaf Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 16:46:24 -0400
Subject: [PATCH 03/44] Move get_post_types to form class

---
 ...splayfeaturedimagegenesis-widgets-form.php | 22 +++++++++++++++++++
 ...eaturedimagegenesis-cpt-archive-widget.php | 22 -------------------
 includes/widgets/fields/cpt-post_type.php     |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
index 0d62a2b..5eb6898 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
@@ -26,6 +26,28 @@ class DisplayFeaturedImageGenesisWidgetsForm {
 		$this->instance = $instance;
 	}
 
+	/**
+	 * Get the public registered post types on the site.
+	 *
+	 * @return mixed
+	 */
+	public function get_post_types() {
+		$args       = array(
+			'public'      => true,
+			'_builtin'    => false,
+			'has_archive' => true,
+		);
+		$output     = 'objects';
+		$post_types = get_post_types( $args, $output );
+
+		$options['post'] = __( 'Posts', 'display-featured-image-genesis' );
+		foreach ( $post_types as $post_type ) {
+			$options[ $post_type->name ] = $post_type->label;
+		}
+
+		return $options;
+	}
+
 	/**
 	 * @return array
 	 */
diff --git a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
index e69da59..c6e2656 100644
--- a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
@@ -163,26 +163,4 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 			'archive' => include 'fields/archive.php',
 		) );
 	}
-
-	/**
-	 * Get the public registered post types on the site.
-	 *
-	 * @return mixed
-	 */
-	protected function get_post_types() {
-		$args       = array(
-			'public'      => true,
-			'_builtin'    => false,
-			'has_archive' => true,
-		);
-		$output     = 'objects';
-		$post_types = get_post_types( $args, $output );
-
-		$options['post'] = __( 'Posts', 'display-featured-image-genesis' );
-		foreach ( $post_types as $post_type ) {
-			$options[ $post_type->name ] = $post_type->label;
-		}
-
-		return $options;
-	}
 }
diff --git a/includes/widgets/fields/cpt-post_type.php b/includes/widgets/fields/cpt-post_type.php
index cf0ab6f..99d567b 100644
--- a/includes/widgets/fields/cpt-post_type.php
+++ b/includes/widgets/fields/cpt-post_type.php
@@ -10,7 +10,7 @@ return array(
 			'id'      => 'post_type',
 			'label'   => __( 'Post Type:', 'display-featured-image-genesis' ),
 			'flex'    => true,
-			'choices' => $this->get_post_types(),
+			'choices' => $form->get_post_types(),
 		),
 	),
 );

From 9c0cf4a12fd0ac022d259be75f3b2edbe04b24ab Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 16:46:45 -0400
Subject: [PATCH 04/44] Move CPT defaults to new file

---
 ...playfeaturedimagegenesis-cpt-archive-widget.php | 13 +------------
 includes/widgets/fields/cpt-defaults.php           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 includes/widgets/fields/cpt-defaults.php

diff --git a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
index c6e2656..7baab40 100644
--- a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
@@ -46,18 +46,7 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 	 * @return array
 	 */
 	public function defaults() {
-		return array(
-			'title'             => '',
-			'post_type'         => 'post',
-			'show_image'        => 0,
-			'image_alignment'   => 'alignnone',
-			'image_size'        => 'medium',
-			'show_title'        => 0,
-			'show_content'      => 0,
-			'custom_content'    => '',
-			'archive_link'      => 0,
-			'archive_link_text' => __( 'View Content Type Archive', 'display-featured-image-genesis' ),
-		);
+		return include 'fields/cpt-defaults.php';
 	}
 
 	/**
diff --git a/includes/widgets/fields/cpt-defaults.php b/includes/widgets/fields/cpt-defaults.php
new file mode 100644
index 0000000..9b41376
--- /dev/null
+++ b/includes/widgets/fields/cpt-defaults.php
@@ -0,0 +1,14 @@
+<?php
+
+return array(
+	'title'             => '',
+	'post_type'         => 'post',
+	'show_image'        => 0,
+	'image_alignment'   => 'alignnone',
+	'image_size'        => 'medium',
+	'show_title'        => 0,
+	'show_content'      => 0,
+	'custom_content'    => '',
+	'archive_link'      => 0,
+	'archive_link_text' => __( 'View Content Type Archive', 'display-featured-image-genesis' ),
+);

From fde6e6c565847a2a07e6c99fdc7f37b01cd1da85 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 16:47:07 -0400
Subject: [PATCH 05/44] Create one working block (CPT)

---
 .../class-displayfeaturedimagegenesis.php     |   9 +-
 includes/js/test-block.js                     | 190 +++++++++++++
 includes/js/test-block.min.js                 |   1 +
 ...splayfeaturedimagegenesis-output-block.php | 257 ++++++++++++++++++
 4 files changed, 454 insertions(+), 3 deletions(-)
 create mode 100644 includes/js/test-block.js
 create mode 100644 includes/js/test-block.min.js
 create mode 100644 includes/widgets/class-displayfeaturedimagegenesis-output-block.php

diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index 82fb952..5735ef6 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -254,9 +254,12 @@ class Display_Featured_Image_Genesis {
 		if ( ! function_exists( 'register_block_type' ) ) {
 			return;
 		}
-		include_once 'blocks/class-displayfeaturedimagegenesis-blocks.php';
-		$blocks = new DisplayFeaturedImageGenesisBlocks();
-		$blocks->init();
+//		include_once 'blocks/class-displayfeaturedimagegenesis-blocks.php';
+//		$blocks = new DisplayFeaturedImageGenesisBlocks();
+//		$blocks->init();
+		include_once 'widgets/class-displayfeaturedimagegenesis-output-block.php';
+		$block = new DisplayFeaturedImageGenesisOutputBlock();
+		$block->init();
 	}
 
 	/**
diff --git a/includes/js/test-block.js b/includes/js/test-block.js
new file mode 100644
index 0000000..44a97c3
--- /dev/null
+++ b/includes/js/test-block.js
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2019 Robin Cornett
+ */
+
+(function ( wp, undefined ) {
+	'use strict';
+	const DFIGBlockObject = {
+		el: wp.element.createElement,
+	};
+
+	/**
+	 * Initialize and register the block.
+	 */
+	DFIGBlockObject.init = function ( params ) {
+		const registerBlockType = wp.blocks.registerBlockType,
+		      ServerSideRender  = wp.components.ServerSideRender,
+		      InspectorControls = wp.editor.InspectorControls;
+
+		registerBlockType( params.block, {
+			title: params.title,
+			description: params.description,
+			keywords: params.keywords,
+			icon: params.icon,
+			category: params.category,
+			supports: {
+				html: false
+			},
+
+			getEditWrapperProps( {blockAlignment} ) {
+				return {'data-align': blockAlignment};
+			},
+
+			edit: props => {
+				const {
+					      attributes,
+					      setAttributes
+				      }                     = props,
+				      Fragment              = wp.element.Fragment,
+				      BlockControls         = wp.editor.BlockControls,
+				      BlockAlignmentToolbar = wp.editor.BlockAlignmentToolbar;
+				return [
+					DFIGBlockObject.el( ServerSideRender, {
+						block: DFIGBlockObject.params.block,
+						attributes: attributes
+					} ),
+					DFIGBlockObject.el( Fragment, null,
+						DFIGBlockObject.el( BlockControls, null,
+							DFIGBlockObject.el( BlockAlignmentToolbar, {
+								value: attributes.blockAlignment,
+								controls: ['wide', 'full'],
+								onChange: ( value ) => {
+									setAttributes( {blockAlignment: value} );
+								},
+							} )
+						),
+					),
+					DFIGBlockObject.el( InspectorControls, {},
+						_getPanels( props )
+					)
+				];
+			},
+
+			save: props => {
+				return null;
+			},
+		} );
+	};
+
+	/**
+	 * Get the panels for the block controls.
+	 *
+	 * @param props
+	 * @return {Array}
+	 * @private
+	 */
+	function _getPanels( props ) {
+		const panels    = [],
+		      PanelBody = wp.components.PanelBody;
+		Object.keys( DFIGBlockObject.params.panels ).forEach( function ( key, index ) {
+			if ( DFIGBlockObject.params.panels.hasOwnProperty( key ) ) {
+				const IndividualPanel = DFIGBlockObject.params.panels[key];
+				panels[index] = DFIGBlockObject.el( PanelBody, {
+					title: IndividualPanel.title,
+					initialOpen: IndividualPanel.initialOpen,
+					className: 'scriptless-panel-' + key
+				}, _getControls( props, IndividualPanel.attributes ) );
+			}
+		} );
+
+		return panels;
+	}
+
+	/**
+	 * Get all of the block controls, with defaults and options.
+	 *
+	 * @param props
+	 * @param fields
+	 * @return {Array}
+	 * @private
+	 */
+	function _getControls( props, fields ) {
+		const controls = [];
+		Object.keys( fields ).forEach( function ( key, index ) {
+			if ( fields.hasOwnProperty( key ) ) {
+				var skipped = [ 'blockAlignment', 'className' ];
+				if ( -1 !== skipped.indexOf( key ) ) {
+					return;
+				}
+				const IndividualField = fields[key],
+				      control         = _getControlType( IndividualField.method, IndividualField.type );
+				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
+			}
+		} );
+
+		return controls;
+	}
+
+	/**
+	 * Get the control type.
+	 * @param method
+	 * @param control_type
+	 * @return {*}
+	 * @private
+	 */
+	function _getControlType( method, control_type ) {
+		const {
+			      TextControl,
+			      SelectControl,
+			      RangeControl,
+			      CheckboxControl,
+			      TextareaControl
+		      } = wp.components;
+		const control = TextControl;
+		if ( 'select' === method ) {
+			return SelectControl;
+		} else if ( 'number' === method && 'number' === control_type ) {
+			return RangeControl;
+		} else if ( 'checkbox' === method ) {
+			return CheckboxControl;
+		} else if ( 'textarea' === method ) {
+			return TextareaControl;
+		}
+
+		return control;
+	}
+
+	/**
+	 * Build the individual control object. Sets up standard properties for all
+	 * controls; then adds custom properties as needed.
+	 *
+	 * @param key
+	 * @param field
+	 * @param props
+	 * @return {{label: *, value: *, className: string, onChange: onChange}}
+	 * @private
+	 */
+	function _getIndividualControl( key, field, props ) {
+		const {attributes, setAttributes} = props;
+		const control = {
+			label: field.label,
+			value: attributes[key],
+			className: 'displayfeaturedimagegenesis-' + key,
+			onChange: ( value ) => {
+				setAttributes( {[key]: value} );
+			}
+		};
+
+		if ( 'select' === field.method ) {
+			control.options = field.options;
+		} else if ( 'number' === field.method ) {
+			control.min = field.min;
+			control.max = field.max;
+			if ( 'number' !== field.type ) {
+				control.type = 'number';
+			} else {
+				control.initialPosition = field.min;
+			}
+		} else if ( 'checkbox' === field.method ) {
+			control.checked = attributes[key];
+		}
+
+		return control;
+	}
+
+	DFIGBlockObject.params = typeof DisplayFeaturedImageTestBlock === 'undefined' ? '' : DisplayFeaturedImageTestBlock;
+
+	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
+		DFIGBlockObject.init( DFIGBlockObject.params );
+	}
+} )( wp );
diff --git a/includes/js/test-block.min.js b/includes/js/test-block.min.js
new file mode 100644
index 0000000..34bbd44
--- /dev/null
+++ b/includes/js/test-block.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:t=>{const{attributes:o,setAttributes:i}=t,s=e.element.Fragment,a=e.editor.BlockControls,c=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:n.params.block,attributes:o}),n.el(s,null,n.el(a,null,n.el(c,{value:o.blockAlignment,controls:["wide","full"],onChange:e=>{i({blockAlignment:e})}}))),n.el(r,{},function(t){const o=[],l=e.components.PanelBody;return Object.keys(n.params.panels).forEach(function(r,i){if(n.params.panels.hasOwnProperty(r)){const s=n.params.panels[r];o[i]=n.el(l,{title:s.title,initialOpen:s.initialOpen,className:"scriptless-panel-"+r},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,s.attributes))}}),o}(t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&n.init(n.params)}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
new file mode 100644
index 0000000..8139b21
--- /dev/null
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright (c) 2019 Robin Cornett
+ */
+
+/**
+ * Class ScriptlessSocialSharingOutputBlock
+ */
+class DisplayFeaturedImageGenesisOutputBlock {
+
+	/**
+	 * The block name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'displayfeaturedimagegenesis/post-type';
+
+	/**
+	 * @var string
+	 */
+	protected $block = 'displayfeaturedimagegenesis-post-type';
+
+	/**
+	 * The plugin setting.
+	 * @var array
+	 */
+	protected $setting;
+
+	/**
+	 * Register our block type.
+	 */
+	public function init() {
+		$this->register_script_style();
+		register_block_type(
+			$this->name,
+			array(
+				'editor_script'   => $this->block . '-block',
+				'attributes'      => $this->fields(),
+				'render_callback' => array( $this, 'render' ),
+			)
+		);
+		add_action( 'enqueue_block_editor_assets', array( $this, 'localize' ) );
+	}
+
+	/**
+	 * Render the widget in a container div.
+	 *
+	 * @param $atts
+	 *
+	 * @return string
+	 */
+	public function render( $atts ) {
+		$atts      = wp_parse_args( $atts, include 'fields/cpt-defaults.php' );
+		$post_type = get_post_type_object( $atts['post_type'] );
+		if ( ! $post_type ) {
+			return '';
+		}
+
+		$classes = $this->get_block_classes( $atts );
+		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+		$output = '<div class="' . implode( ' ', $classes ) . '">';
+		ob_start();
+		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
+		$output .= ob_get_contents();
+		ob_clean();
+		$output .= '</div>';
+
+		return $output;
+	}
+
+	/**
+	 * Get the CSS classes for the block.
+	 * @param $atts
+	 *
+	 * @return array
+	 */
+	private function get_block_classes( $atts ) {
+		array(
+			'wp-block-' . $this->block,
+		);
+		if ( ! empty( $atts['className'] ) ) {
+			$classes[] = $atts['className'];
+		}
+		if ( ! empty( $atts['blockAlignment'] ) ) {
+			$classes[] = 'align' . $atts['blockAlignment'];
+		}
+
+		return $classes;
+	}
+
+	/**
+	 * Register the block script and style.
+	 */
+	public function register_script_style() {
+		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
+		$version = '3.2.0';
+		if ( ! $minify ) {
+			$version .= current_time( 'gmt' );
+		}
+		wp_register_script(
+			$this->block . '-block',
+			plugin_dir_url( dirname( __FILE__ ) ) . "js/test-block{$minify}.js",
+			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
+			$version,
+			false
+		);
+	}
+
+	/**
+	 * Localize.
+	 */
+	public function localize() {
+		wp_localize_script( $this->block . '-block', 'DisplayFeaturedImageTestBlock', $this->get_localization_data() );
+	}
+
+	/**
+	 * Get the data for localizing everything.
+	 * @return array
+	 */
+	protected function get_localization_data() {
+		return array(
+			'block'       => $this->name,
+			'title'       => __( 'Display Featured Image Genesis Post Type', 'scriptless-social-sharing' ),
+			'description' => __( 'featured image.', 'scriptless-social-sharing' ),
+			'keywords'    => array(
+				__( 'image', 'scriptless-social-sharing' ),
+				__( 'featured', 'scriptless-social-sharing' ),
+			),
+			'panels'      => array(
+				'main' => array(
+					'title'       => __( 'Block Settings', 'scriptless-social-sharing' ),
+					'initialOpen' => true,
+					'attributes'  => $this->fields(),
+				),
+			),
+			'icon'        => 'format-image',
+			'category'    => 'widgets',
+		);
+	}
+
+	/**
+	 * Get the fields for the block.
+	 * @return array
+	 */
+	private function fields() {
+		$output = array();
+		foreach ( $this->get_all_fields() as $key => $value ) {
+			if ( ! empty( $value['args']['id'] ) ) {
+				$key = $value['args']['id'];
+			}
+			$output[ $key ] = $this->get_individual_field_attributes( $value );
+		}
+
+		return $output;
+	}
+
+	private function get_all_fields() {
+		$form       = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		$fields     = array_merge(
+			include 'fields/cpt-post_type.php',
+			include 'fields/text.php',
+			include 'fields/image.php',
+			include 'fields/archive.php'
+		);
+		$attributes = array_merge(
+			array(
+				'blockAlignment' => array(
+					'type'    => 'string',
+					'default' => '',
+				),
+				'className'      => array(
+					'type'    => 'string',
+					'default' => '',
+				),
+				'title'          => array(
+					'type'    => 'string',
+					'default' => '',
+					'args'    => array(
+						'id'    => 'title',
+						'label' => 'Title',
+					),
+				),
+			),
+			$fields
+		);
+
+		return $attributes;
+	}
+
+	/**
+	 * Get an array of attributes for an individual field.
+	 *
+	 * @param $field
+	 *
+	 * @return array
+	 */
+	protected function get_individual_field_attributes( $field ) {
+		$method     = empty( $field['method'] ) ? 'text' : $field['method'];
+		$field_type = $this->get_field_type( $method );
+		if ( empty( $field['args']['label'] ) ) {
+			return $field;
+		}
+		$defaults   = include 'fields/cpt-defaults.php';
+		$attributes = array(
+			'type'    => $field_type,
+			'default' => $defaults[ $field['args']['id'] ],
+			'label'   => $field['args']['label'],
+			'method'  => $method,
+		);
+		if ( in_array( 'number', array( $field_type, $method ), true ) ) {
+			$attributes['min'] = $field['args']['min'];
+			$attributes['max'] = $field['args']['max'];
+		} elseif ( 'select' === $method ) {
+			$attributes['options'] = $this->convert_choices_for_select( $field['args']['choices'] );
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Define the type of field for our script.
+	 *
+	 * @param $method
+	 *
+	 * @return string
+	 */
+	private function get_field_type( $method ) {
+		$type = 'string';
+		if ( 'number' === $method ) {
+			return $method;
+		}
+		if ( 'checkbox' === $method ) {
+			return 'boolean';
+		}
+
+		return $type;
+	}
+
+	/**
+	 * Convert a standard PHP array to what the block editor needs.
+	 *
+	 * @param $options
+	 *
+	 * @return array
+	 */
+	private function convert_choices_for_select( $options ) {
+		$output = array();
+		foreach ( $options as $value => $label ) {
+			$output[] = array(
+				'value' => $value,
+				'label' => $label,
+			);
+		}
+
+		return $output;
+	}
+}

From cd681a4916f75ce8f4088dd1e9deb8457d934c3b Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 16:53:51 -0400
Subject: [PATCH 06/44] Re-minimize backstretch script

---
 includes/js/backstretch.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/js/backstretch.min.js b/includes/js/backstretch.min.js
index e1cbf36..bddc53d 100644
--- a/includes/js/backstretch.min.js
+++ b/includes/js/backstretch.min.js
@@ -1 +1 @@
-/*! Backstretch - v2.1.15 - 2017-06-22\n* Copyright (c) 2017 Scott Robbin;* Fork of improvements - by Daniel Cohen Gindi (danielgindi@gmail.com) Licensed MIT */!function(a,b,c){"use strict";function d(a){return m.hasOwnProperty(a)?a:"cover"}var e=/^.*(youtu\.be\/|youtube\.com\/v\/|youtube\.com\/embed\/|youtube\.com\/watch\?v=|youtube\.com\/watch\?.*\&v=)([^#\&\?]*).*/i;a.fn.backstretch=function(d,e){var f=arguments;0===a(b).scrollTop()&&b.scrollTo(0,0);var g;return this.each(function(b){var h=a(this),i=h.data("backstretch");if(i){if("string"==typeof f[0]&&"function"==typeof i[f[0]]){var j=i[f[0]].apply(i,Array.prototype.slice.call(f,1));return j===i&&(j=c),void(j!==c&&(g=g||[],g[b]=j))}e=a.extend(i.options,e),i.hasOwnProperty("destroy")&&i.destroy(!0)}if(!d||d&&0===d.length){var k=h.css("background-image");k&&"none"!==k?d=[{url:h.css("backgroundImage").replace(/url\(|\)|"|'/g,"")}]:a.error("No images were supplied for Backstretch, or element must have a CSS-defined background image.")}i=new n(this,d,e||{}),h.data("backstretch",i)}),g?1===g.length?g[0]:g:this},a.backstretch=function(b,c){return a("body").backstretch(b,c).data("backstretch")},a.expr[":"].backstretch=function(b){return a(b).data("backstretch")!==c},a.fn.backstretch.defaults={duration:5e3,transition:"fade",transitionDuration:0,animateFirst:!0,alignX:.5,alignY:.5,paused:!1,start:0,preload:2,preloadSize:1,resolutionRefreshRate:2500,resolutionChangeRatioThreshold:.1};var f={wrap:{left:0,top:0,overflow:"hidden",margin:0,padding:0,height:"100%",width:"100%",zIndex:-999999},itemWrapper:{position:"absolute",display:"none",margin:0,padding:0,border:"none",width:"100%",height:"100%",zIndex:-999999},item:{position:"absolute",margin:0,padding:0,border:"none",width:"100%",height:"100%",maxWidth:"none"}},g=function(){var c=function(a){for(var b=1;b<a.length;b++){for(var c=a[b],d=b;a[d-1]&&parseInt(a[d-1].width,10)>parseInt(c.width,10);)a[d]=a[d-1],--d;a[d]=c}return a},d=function(a,c,d){for(var e,f,g=b.devicePixelRatio||1,h=q(),i=(r(),c>a?"portrait":a>c?"landscape":"square"),j=0,k=0;k<d.length&&(f=d[k],"string"==typeof f&&(f=d[k]={url:f}),f.pixelRatio&&"auto"!==f.pixelRatio&&parseFloat(f.pixelRatio)!==g||f.deviceOrientation&&f.deviceOrientation!==h||f.windowOrientation&&f.windowOrientation!==h||f.orientation&&f.orientation!==i||(j=k,e=a,"auto"===f.pixelRatio&&(a*=g),!(f.width>=e)));k++);return d[Math.min(k,j)]},e=function(a,b){if("string"==typeof a)a=a.replace(/{{(width|height)}}/g,b);else if(a instanceof Array)for(var c=0;c<a.length;c++)a[c].src?a[c].src=e(a[c].src,b):a[c]=e(a[c],b);return a};return function(b,f){for(var g=b.width(),h=b.height(),i=[],j=function(a,b){return"width"===b?g:"height"===b?h:a},k=0;k<f.length;k++)if(a.isArray(f[k])){f[k]=c(f[k]);var l=d(g,h,f[k]);i.push(l)}else{"string"==typeof f[k]&&(f[k]={url:f[k]});var m=a.extend({},f[k]);m.url=e(m.url,j),i.push(m)}return i}}(),h=function(a){return e.test(a.url)||a.isVideo},i=function(b,c,d,e,f){var g=[],i=function(a){for(var b=0;b<g.length;b++)if(g[b].src===a.src)return g[b];return g.push(a),a},j=function(a,b,c){"function"==typeof b&&b.call(a,c)};return function b(c,d,e,f,g){if("undefined"!=typeof c){a.isArray(c)||(c=[c]),arguments.length<5&&"function"==typeof arguments[arguments.length-1]&&(g=arguments[arguments.length-1]),d="function"!=typeof d&&d?d:0,e="function"==typeof e||!e||e<0?c.length:Math.min(e,c.length),f="function"!=typeof f&&f?f:1,d>=c.length&&(d=0,e=0),f<0&&(f=e),f=Math.min(f,e);var k=c.slice(d+f,e-f);if(c=c.slice(d,f),e=c.length,!e)return void j(c,g,!0);for(var l,m=0,n=function(){m++,m===e&&(j(c,g,!k),b(k,0,0,f,g))},o=0;o<c.length;o++)h(c[o])||(l=new Image,l.src=c[o].url,l=i(l),l.complete?n():a(l).on("load error",n))}}}(),j=function(b){for(var c=[],d=0;d<b.length;d++)"string"==typeof b[d]?c.push({url:b[d]}):a.isArray(b[d])?c.push(j(b[d])):c.push(k(b[d]));return c},k=function(a,e){return(a.centeredX||a.centeredY)&&(b.console&&b.console.log&&b.console.log("jquery.backstretch: `centeredX`/`centeredY` is deprecated, please use `alignX`/`alignY`"),a.centeredX&&(a.alignX=.5),a.centeredY&&(a.alignY=.5)),a.speed!==c&&(b.console&&b.console.log&&b.console.log("jquery.backstretch: `speed` is deprecated, please use `transitionDuration`"),a.transitionDuration=a.speed,a.transition="fade"),a.resolutionChangeRatioTreshold!==c&&(b.console.log("jquery.backstretch: `treshold` is a typo!"),a.resolutionChangeRatioThreshold=a.resolutionChangeRatioTreshold),a.fadeFirst!==c&&(a.animateFirst=a.fadeFirst),a.fade!==c&&(a.transitionDuration=a.fade,a.transition="fade"),a.scale&&(a.scale=d(a.scale)),l(a)},l=function(a,b){return"left"===a.alignX?a.alignX=0:"center"===a.alignX?a.alignX=.5:"right"===a.alignX?a.alignX=1:(a.alignX!==c||b)&&(a.alignX=parseFloat(a.alignX),isNaN(a.alignX)&&(a.alignX=.5)),"top"===a.alignY?a.alignY=0:"center"===a.alignY?a.alignY=.5:"bottom"===a.alignY?a.alignY=1:(a.alignX!==c||b)&&(a.alignY=parseFloat(a.alignY),isNaN(a.alignY)&&(a.alignY=.5)),a},m={cover:"cover",fit:"fit","fit-smaller":"fit-smaller",fill:"fill"},n=function(c,d,e){this.options=a.extend({},a.fn.backstretch.defaults,e||{}),this.firstShow=!0,k(this.options,!0),this.images=j(a.isArray(d)?d:[d]),this.options.paused&&(this.paused=!0),this.options.start>=this.images.length&&(this.options.start=this.images.length-1),this.options.start<0&&(this.options.start=0),this.isBody=c===document.body;var h=a(b);this.$container=a(c),this.$root=this.isBody?s?h:a(document):this.$container,this.originalImages=this.images,this.images=g(this.options.alwaysTestWindowResolution?h:this.$root,this.originalImages),i(this.images,this.options.start||0,this.options.preload||1);var l=this.$container.children(".backstretch").first();if(this.$wrap=l.length?l:a('<div class="backstretch"></div>').css(this.options.bypassCss?{}:f.wrap).appendTo(this.$container),!this.options.bypassCss){if(!this.isBody){var m=this.$container.css("position"),n=this.$container.css("zIndex");this.$container.css({position:"static"===m?"relative":m,zIndex:"auto"===n?0:n}),this.$wrap.css({zIndex:-999998})}this.$wrap.css({position:this.isBody&&s?"fixed":"absolute"})}this.index=this.options.start,this.show(this.index),h.on("resize.backstretch",a.proxy(this.resize,this)).on("orientationchange.backstretch",a.proxy(function(){this.isBody&&0===b.pageYOffset&&(b.scrollTo(0,1),this.resize())},this))},o=function(b){var d=b.transition||"fade";"string"==typeof d&&d.indexOf("|")>-1&&(d=d.split("|")),d instanceof Array&&(d=d[Math.round(Math.random()*(d.length-1))]);var e=b.new,f=b.old?b.old:a([]);switch(d.toString().toLowerCase()){default:case"fade":e.fadeIn({duration:b.duration,complete:b.complete,easing:b.easing||c});break;case"fadeinout":case"fade_in_out":var g=function(){e.fadeIn({duration:b.duration/2,complete:b.complete,easing:b.easing||c})};f.length?f.fadeOut({duration:b.duration/2,complete:g,easing:b.easing||c}):g();break;case"pushleft":case"push_left":case"pushright":case"push_right":case"pushup":case"push_up":case"pushdown":case"push_down":case"coverleft":case"cover_left":case"coverright":case"cover_right":case"coverup":case"cover_up":case"coverdown":case"cover_down":var h=d.match(/^(cover|push)_?(.*)$/),i="left"===h[2]?"right":"right"===h[2]?"left":"down"===h[2]?"top":"up"===h[2]?"bottom":"right",j={display:""},k={};if(j[i]="-100%",k[i]=0,e.css(j).animate(k,{duration:b.duration,complete:function(){e.css(i,""),b.complete.apply(this,arguments)},easing:b.easing||c}),"push"===h[1]&&f.length){var l={};l[i]="100%",f.animate(l,{duration:b.duration,complete:function(){f.css("display","none")},easing:b.easing||c})}}};n.prototype={resize:function(){try{var e=this.options.alwaysTestWindowResolution?a(b):this.$root,f=e.width(),h=e.height(),j=f/(this._lastResizeContainerWidth||0),k=h/(this._lastResizeContainerHeight||0),l=this.options.resolutionChangeRatioThreshold||0;if((f!==this._lastResizeContainerWidth||h!==this._lastResizeContainerHeight)&&(Math.abs(j-1)>=l||isNaN(j)||Math.abs(k-1)>=l||isNaN(k))&&(this._lastResizeContainerWidth=f,this._lastResizeContainerHeight=h,this.images=g(e,this.originalImages),this.options.preload&&i(this.images,(this.index+1)%this.images.length,this.options.preload),1===this.images.length&&this._currentImage.url!==this.images[0].url)){var m=this;clearTimeout(m._selectAnotherResolutionTimeout),m._selectAnotherResolutionTimeout=setTimeout(function(){m.show(0)},this.options.resolutionRefreshRate)}var n,o,p={left:0,top:0,right:"auto",bottom:"auto"},q=this.isBody?this.$root.width():this.$root.innerWidth(),r=this.isBody?b.innerHeight?b.innerHeight:this.$root.height():this.$root.innerHeight(),s=this.$itemWrapper.data("width"),t=this.$itemWrapper.data("height"),u=s/t||1,v=this._currentImage.alignX===c?this.options.alignX:this._currentImage.alignX,w=this._currentImage.alignY===c?this.options.alignY:this._currentImage.alignY,x=d(this._currentImage.scale||this.options.scale);if("fit"===x||"fit-smaller"===x){if(n=s,o=t,n>q||o>r||"fit-smaller"===x){var y=q/r;y>u?(n=Math.floor(r*u),o=r):y<u?(n=q,o=Math.floor(q/u)):(n=q,o=r)}}else"fill"===x?(n=q,o=r):(n=Math.max(r*u,q),o=Math.max(n/u,r));p.top=-(o-r)*w,p.left=-(n-q)*v,p.width=n,p.height=o,this.options.bypassCss||this.$wrap.css({width:q,height:r}).find(">.backstretch-item").not(".deleteable").each(function(){var b=a(this);b.find("img,video,iframe").css(p)});var z=a.Event("backstretch.resize",{relatedTarget:this.$container[0]});this.$container.trigger(z,this)}catch(a){}return this},show:function(b,d){if(!(Math.abs(b)>this.images.length-1)){var e=this,g=e.$wrap.find(">.backstretch-item").addClass("deleteable"),i=e.videoWrapper,j={relatedTarget:e.$container[0]};e.$container.trigger(a.Event("backstretch.before",j),[e,b]),this.index=b;var k=e.images[b];clearTimeout(e._cycleTimeout),delete e.videoWrapper;var l=h(k);return l?(e.videoWrapper=new p(k),e.$item=e.videoWrapper.$video.css("pointer-events","none")):e.$item=a("<img />"),e.$itemWrapper=a('<div class="backstretch-item">').append(e.$item),this.options.bypassCss?e.$itemWrapper.css({display:"none"}):(e.$itemWrapper.css(f.itemWrapper),e.$item.css(f.item)),e.$item.bind(l?"canplay":"load",function(f){var h=a(this),k=h.parent(),m=k.data("options");d&&(m=a.extend({},m,d));var n=this.naturalWidth||this.videoWidth||this.width,p=this.naturalHeight||this.videoHeight||this.height;k.data("width",n).data("height",p);var q=function(a){return m[a]!==c?m[a]:e.options[a]},r=q("transition"),s=q("transitionEasing"),t=q("transitionDuration"),u=function(){i&&(i.stop(),i.destroy()),g.remove(),!e.paused&&e.images.length>1&&e.cycle(),e.options.bypassCss||e.isBody||e.$container.css("background-image","none"),a(["after","show"]).each(function(){e.$container.trigger(a.Event("backstretch."+this,j),[e,b])}),l&&e.videoWrapper.play()};e.firstShow&&!e.options.animateFirst||!t||!r?(k.show(),u()):o({new:k,old:g,transition:r,duration:t,easing:s,complete:u}),e.firstShow=!1,e.resize()}),e.$itemWrapper.appendTo(e.$wrap),e.$item.attr("alt",k.alt||""),e.$itemWrapper.data("options",k),l||e.$item.attr("src",k.url),e._currentImage=k,e}},current:function(){return this.index},next:function(){var a=Array.prototype.slice.call(arguments,0);return a.unshift(this.index<this.images.length-1?this.index+1:0),this.show.apply(this,a)},prev:function(){var a=Array.prototype.slice.call(arguments,0);return a.unshift(0===this.index?this.images.length-1:this.index-1),this.show.apply(this,a)},pause:function(){return this.paused=!0,this.videoWrapper&&this.videoWrapper.pause(),this},resume:function(){return this.paused=!1,this.videoWrapper&&this.videoWrapper.play(),this.cycle(),this},cycle:function(){if(this.images.length>1){clearTimeout(this._cycleTimeout);var b=this._currentImage&&this._currentImage.duration||this.options.duration,c=h(this._currentImage),d=function(){this.$item.off(".cycle"),this.paused||this.next()};if(c){if(!this._currentImage.loop){var e=0;this.$item.on("playing.cycle",function(){var b=a(this).data("player");clearTimeout(e),e=setTimeout(function(){b.pause(),b.$video.trigger("ended")},1e3*(b.getDuration()-b.getCurrentTime()))}).on("ended.cycle",function(){clearTimeout(e)})}this.$item.on("error.cycle initerror.cycle",a.proxy(d,this))}c&&!this._currentImage.duration?this.$item.on("ended.cycle",a.proxy(d,this)):this._cycleTimeout=setTimeout(a.proxy(d,this),b)}return this},destroy:function(c){a(b).off("resize.backstretch orientationchange.backstretch"),this.videoWrapper&&this.videoWrapper.destroy(),clearTimeout(this._cycleTimeout),c||this.$wrap.remove(),this.$container.removeData("backstretch")}};var p=function(){this.init.apply(this,arguments)};p.prototype.init=function(d){var f,g=this,h=function(){g.$video=f,g.video=f[0]},i="video";if(d.url instanceof Array||!e.test(d.url)||(i="youtube"),g.type=i,"youtube"===i){p.loadYoutubeAPI(),g.ytId=d.url.match(e)[2];var j="https://www.youtube.com/embed/"+g.ytId+"?rel=0&autoplay=0&showinfo=0&controls=0&modestbranding=1&cc_load_policy=0&disablekb=1&iv_load_policy=3&loop=0&enablejsapi=1&origin="+encodeURIComponent(b.location.origin);g.__ytStartMuted=!!d.mute||d.mute===c,f=a("<iframe />").attr({src_to_load:j}).css({border:0,margin:0,padding:0}).data("player",g),d.loop&&f.on("ended.loop",function(){g.__manuallyStopped||g.play()}),g.ytReady=!1,h(),b.YT?(g._initYoutube(),f.trigger("initsuccess")):a(b).one("youtube_api_load",function(){g._initYoutube(),f.trigger("initsuccess")})}else{f=a("<video>").prop("autoplay",!1).prop("controls",!1).prop("loop",!!d.loop).prop("muted",!!d.mute||d.mute===c).prop("preload","auto").prop("poster",d.poster||"");for(var k=d.url instanceof Array?d.url:[d.url],l=0;l<k.length;l++){var m=k[l];"string"==typeof m&&(m={src:m}),a("<source>").attr("src",m.src).attr("type",m.type||null).appendTo(f)}f[0].canPlayType&&k.length?f.trigger("initsuccess"):f.trigger("initerror"),h()}},p.prototype._initYoutube=function(){var c=this,d=b.YT;c.$video.attr("src",c.$video.attr("src_to_load")).removeAttr("src_to_load");var e=!!c.$video[0].parentNode;if(!e){var f=a("<div>").css("display","none !important").appendTo(document.body);c.$video.appendTo(f)}var g=new d.Player(c.video,{events:{onReady:function(){c.__ytStartMuted&&g.mute(),e||(c.$video[0].parentNode===f[0]&&c.$video.detach(),f.remove()),c.ytReady=!0,c._updateYoutubeSize(),c.$video.trigger("canplay")},onStateChange:function(a){switch(a.data){case d.PlayerState.PLAYING:c.$video.trigger("playing");break;case d.PlayerState.ENDED:c.$video.trigger("ended");break;case d.PlayerState.PAUSED:c.$video.trigger("pause");break;case d.PlayerState.BUFFERING:c.$video.trigger("waiting");break;case d.PlayerState.CUED:c.$video.trigger("canplay")}},onPlaybackQualityChange:function(){c._updateYoutubeSize(),c.$video.trigger("resize")},onError:function(a){c.hasError=!0,c.$video.trigger({type:"error",error:a})}}});return c.ytPlayer=g,c},p.prototype._updateYoutubeSize=function(){var a=this;switch(a.ytPlayer.getPlaybackQuality()||"medium"){case"small":a.video.videoWidth=426,a.video.videoHeight=240;break;case"medium":a.video.videoWidth=640,a.video.videoHeight=360;break;default:case"large":a.video.videoWidth=854,a.video.videoHeight=480;break;case"hd720":a.video.videoWidth=1280,a.video.videoHeight=720;break;case"hd1080":a.video.videoWidth=1920,a.video.videoHeight=1080;break;case"highres":a.video.videoWidth=2560,a.video.videoHeight=1440}return a},p.prototype.play=function(){var a=this;return a.__manuallyStopped=!1,"youtube"===a.type?a.ytReady&&(a.$video.trigger("play"),a.ytPlayer.playVideo()):a.video.play(),a},p.prototype.pause=function(){var a=this;return a.__manuallyStopped=!1,"youtube"===a.type?a.ytReady&&a.ytPlayer.pauseVideo():a.video.pause(),a},p.prototype.stop=function(){var a=this;return a.__manuallyStopped=!0,"youtube"===a.type?a.ytReady&&(a.ytPlayer.pauseVideo(),a.ytPlayer.seekTo(0)):(a.video.pause(),a.video.currentTime=0),a},p.prototype.destroy=function(){var a=this;return a.ytPlayer&&a.ytPlayer.destroy(),a.$video.remove(),a},p.prototype.getCurrentTime=function(a){var b=this;return"youtube"!==b.type?b.video.currentTime:b.ytReady?b.ytPlayer.getCurrentTime():0},p.prototype.setCurrentTime=function(a){var b=this;return"youtube"===b.type?b.ytReady&&b.ytPlayer.seekTo(a,!0):b.video.currentTime=a,b},p.prototype.getDuration=function(){var a=this;return"youtube"!==a.type?a.video.duration:a.ytReady?a.ytPlayer.getDuration():0},p.loadYoutubeAPI=function(){if(!b.YT){a("script[src*=www\\.youtube\\.com\\/iframe_api]").length||a('<script type="text/javascript" src="https://www.youtube.com/iframe_api">').appendTo("body");var c=setInterval(function(){b.YT&&b.YT.loaded&&(a(b).trigger("youtube_api_load"),clearTimeout(c))},50)}};var q=function(){if("matchMedia"in b){if(b.matchMedia("(orientation: portrait)").matches)return"portrait";if(b.matchMedia("(orientation: landscape)").matches)return"landscape"}return screen.height>screen.width?"portrait":"landscape"},r=function(){return b.innerHeight>b.innerWidth?"portrait":b.innerWidth>b.innerHeight?"landscape":"square"},s=function(){var a=navigator.userAgent,c=navigator.platform,d=a.match(/AppleWebKit\/([0-9]+)/),e=!!d&&d[1],f=a.match(/Fennec\/([0-9]+)/),g=!!f&&f[1],h=a.match(/Opera Mobi\/([0-9]+)/),i=!!h&&h[1],j=a.match(/MSIE ([0-9]+)/),k=!!j&&j[1];return!((c.indexOf("iPhone")>-1||c.indexOf("iPad")>-1||c.indexOf("iPod")>-1)&&e&&e<534||b.operamini&&"[object OperaMini]"==={}.toString.call(b.operamini)||h&&i<7458||a.indexOf("Android")>-1&&e&&e<533||g&&g<6||"palmGetResource"in b&&e&&e<534||a.indexOf("MeeGo")>-1&&a.indexOf("NokiaBrowser/8.5.0")>-1||k&&k<=6)}()}(jQuery,window);
\ No newline at end of file
+!function(t,e,i){"use strict";var o=/^.*(youtu\.be\/|youtube\.com\/v\/|youtube\.com\/embed\/|youtube\.com\/watch\?v=|youtube\.com\/watch\?.*\&v=)([^#\&\?]*).*/i;t.fn.backstretch=function(i,o){var r,a=arguments;return 0===t(e).scrollTop()&&e.scrollTo(0,0),this.each(function(e){var n=t(this),s=n.data("backstretch");if(s){if("string"==typeof a[0]&&"function"==typeof s[a[0]]){var h=s[a[0]].apply(s,Array.prototype.slice.call(a,1));return h===s&&(h=void 0),void(void 0!==h&&((r=r||[])[e]=h))}o=t.extend(s.options,o),s.hasOwnProperty("destroy")&&s.destroy(!0)}if(!i||i&&0===i.length){var c=n.css("background-image");c&&"none"!==c?i=[{url:n.css("backgroundImage").replace(/url\(|\)|"|'/g,"")}]:t.error("No images were supplied for Backstretch, or element must have a CSS-defined background image.")}s=new b(this,i,o||{}),n.data("backstretch",s)}),r?1===r.length?r[0]:r:this},t.backstretch=function(e,i){return t("body").backstretch(e,i).data("backstretch")},t.expr[":"].backstretch=function(e){return void 0!==t(e).data("backstretch")},t.fn.backstretch.defaults={duration:5e3,transition:"fade",transitionDuration:0,animateFirst:!0,alignX:.5,alignY:.5,paused:!1,start:0,preload:2,preloadSize:1,resolutionRefreshRate:2500,resolutionChangeRatioThreshold:.1};var r,a,n,s,h,c,d={wrap:{left:0,top:0,overflow:"hidden",margin:0,padding:0,height:"100%",width:"100%",zIndex:-999999},itemWrapper:{position:"absolute",display:"none",margin:0,padding:0,border:"none",width:"100%",height:"100%",zIndex:-999999},item:{position:"absolute",margin:0,padding:0,border:"none",width:"100%",height:"100%",maxWidth:"none"}},l=(r=function(t){for(var e=1;e<t.length;e++){for(var i=t[e],o=e;t[o-1]&&parseInt(t[o-1].width,10)>parseInt(i.width,10);)t[o]=t[o-1],--o;t[o]=i}return t},a=function(t,i,o){for(var r,a,n=e.devicePixelRatio||1,s=C(),h=(S(),i>t?"portrait":t>i?"landscape":"square"),c=0,d=0;d<o.length&&("string"==typeof(a=o[d])&&(a=o[d]={url:a}),a.pixelRatio&&"auto"!==a.pixelRatio&&parseFloat(a.pixelRatio)!==n||a.deviceOrientation&&a.deviceOrientation!==s||a.windowOrientation&&a.windowOrientation!==s||a.orientation&&a.orientation!==h||(c=d,r=t,"auto"===a.pixelRatio&&(t*=n),!(a.width>=r)));d++);return o[Math.min(d,c)]},n=function(t,e){if("string"==typeof t)t=t.replace(/{{(width|height)}}/g,e);else if(t instanceof Array)for(var i=0;i<t.length;i++)t[i].src?t[i].src=n(t[i].src,e):t[i]=n(t[i],e);return t},function(e,i){for(var o=e.width(),s=e.height(),h=[],c=function(t,e){return"width"===e?o:"height"===e?s:t},d=0;d<i.length;d++)if(t.isArray(i[d])){i[d]=r(i[d]);var l=a(o,s,i[d]);h.push(l)}else{"string"==typeof i[d]&&(i[d]={url:i[d]});var u=t.extend({},i[d]);u.url=n(u.url,c),h.push(u)}return h}),u=function(t){return o.test(t.url)||t.isVideo},p=(s=[],h=function(t){for(var e=0;e<s.length;e++)if(s[e].src===t.src)return s[e];return s.push(t),t},c=function(t,e,i){"function"==typeof e&&e.call(t,i)},function e(i,o,r,a,n){if(void 0!==i){t.isArray(i)||(i=[i]),arguments.length<5&&"function"==typeof arguments[arguments.length-1]&&(n=arguments[arguments.length-1]),o="function"!=typeof o&&o?o:0,r="function"==typeof r||!r||r<0?i.length:Math.min(r,i.length),a="function"!=typeof a&&a?a:1,o>=i.length&&(o=0,r=0),a<0&&(a=r),a=Math.min(a,r);var s=i.slice(o+a,r-a);if(i=i.slice(o,a),r=i.length)for(var d,l=0,p=function(){++l===r&&(c(i,n,!s),e(s,0,0,a,n))},g=0;g<i.length;g++)u(i[g])||((d=new Image).src=i[g].url,(d=h(d)).complete?p():t(d).on("load error",p));else c(i,n,!0)}}),g=function(e){for(var i=[],o=0;o<e.length;o++)"string"==typeof e[o]?i.push({url:e[o]}):t.isArray(e[o])?i.push(g(e[o])):i.push(y(e[o]));return i},y=function(t,i){return(t.centeredX||t.centeredY)&&(e.console&&e.console.log&&e.console.log("jquery.backstretch: `centeredX`/`centeredY` is deprecated, please use `alignX`/`alignY`"),t.centeredX&&(t.alignX=.5),t.centeredY&&(t.alignY=.5)),void 0!==t.speed&&(e.console&&e.console.log&&e.console.log("jquery.backstretch: `speed` is deprecated, please use `transitionDuration`"),t.transitionDuration=t.speed,t.transition="fade"),void 0!==t.resolutionChangeRatioTreshold&&(e.console.log("jquery.backstretch: `treshold` is a typo!"),t.resolutionChangeRatioThreshold=t.resolutionChangeRatioTreshold),void 0!==t.fadeFirst&&(t.animateFirst=t.fadeFirst),void 0!==t.fade&&(t.transitionDuration=t.fade,t.transition="fade"),t.scale&&(t.scale=m(t.scale)),f(t)},f=function(t,e){return"left"===t.alignX?t.alignX=0:"center"===t.alignX?t.alignX=.5:"right"===t.alignX?t.alignX=1:(void 0!==t.alignX||e)&&(t.alignX=parseFloat(t.alignX),isNaN(t.alignX)&&(t.alignX=.5)),"top"===t.alignY?t.alignY=0:"center"===t.alignY?t.alignY=.5:"bottom"===t.alignY?t.alignY=1:(void 0!==t.alignX||e)&&(t.alignY=parseFloat(t.alignY),isNaN(t.alignY)&&(t.alignY=.5)),t},v={cover:"cover",fit:"fit","fit-smaller":"fit-smaller",fill:"fill"};function m(t){return v.hasOwnProperty(t)?t:"cover"}var b=function(i,o,r){this.options=t.extend({},t.fn.backstretch.defaults,r||{}),this.firstShow=!0,y(this.options,!0),this.images=g(t.isArray(o)?o:[o]),this.options.paused&&(this.paused=!0),this.options.start>=this.images.length&&(this.options.start=this.images.length-1),this.options.start<0&&(this.options.start=0),this.isBody=i===document.body;var a=t(e);this.$container=t(i),this.$root=this.isBody?z?a:t(document):this.$container,this.originalImages=this.images,this.images=l(this.options.alwaysTestWindowResolution?a:this.$root,this.originalImages),p(this.images,this.options.start||0,this.options.preload||1);var n=this.$container.children(".backstretch").first();if(this.$wrap=n.length?n:t('<div class="backstretch"></div>').css(this.options.bypassCss?{}:d.wrap).appendTo(this.$container),!this.options.bypassCss){if(!this.isBody){var s=this.$container.css("position"),h=this.$container.css("zIndex");this.$container.css({position:"static"===s?"relative":s,zIndex:"auto"===h?0:h}),this.$wrap.css({zIndex:-999998})}this.$wrap.css({position:this.isBody&&z?"fixed":"absolute"})}this.index=this.options.start,this.show(this.index),a.on("resize.backstretch",t.proxy(this.resize,this)).on("orientationchange.backstretch",t.proxy(function(){this.isBody&&0===e.pageYOffset&&(e.scrollTo(0,1),this.resize())},this))};b.prototype={resize:function(){try{var i=this.options.alwaysTestWindowResolution?t(e):this.$root,o=i.width(),r=i.height(),a=o/(this._lastResizeContainerWidth||0),n=r/(this._lastResizeContainerHeight||0),s=this.options.resolutionChangeRatioThreshold||0;if((o!==this._lastResizeContainerWidth||r!==this._lastResizeContainerHeight)&&(Math.abs(a-1)>=s||isNaN(a)||Math.abs(n-1)>=s||isNaN(n))&&(this._lastResizeContainerWidth=o,this._lastResizeContainerHeight=r,this.images=l(i,this.originalImages),this.options.preload&&p(this.images,(this.index+1)%this.images.length,this.options.preload),1===this.images.length&&this._currentImage.url!==this.images[0].url)){var h=this;clearTimeout(h._selectAnotherResolutionTimeout),h._selectAnotherResolutionTimeout=setTimeout(function(){h.show(0)},this.options.resolutionRefreshRate)}var c,d,u={left:0,top:0,right:"auto",bottom:"auto"},g=this.isBody?this.$root.width():this.$root.innerWidth(),y=this.isBody?e.innerHeight?e.innerHeight:this.$root.height():this.$root.innerHeight(),f=this.$itemWrapper.data("width"),v=this.$itemWrapper.data("height"),b=f/v||1,w=void 0===this._currentImage.alignX?this.options.alignX:this._currentImage.alignX,_=void 0===this._currentImage.alignY?this.options.alignY:this._currentImage.alignY,$=m(this._currentImage.scale||this.options.scale);if("fit"===$||"fit-smaller"===$){if(d=v,(c=f)>g||d>y||"fit-smaller"===$){var T=g/y;T>b?(c=Math.floor(y*b),d=y):T<b?(c=g,d=Math.floor(g/b)):(c=g,d=y)}}else"fill"===$?(c=g,d=y):(c=Math.max(y*b,g),d=Math.max(c/b,y));u.top=-(d-y)*_,u.left=-(c-g)*w,u.width=c,u.height=d,this.options.bypassCss||this.$wrap.css({width:g,height:y}).find(">.backstretch-item").not(".deleteable").each(function(){t(this).find("img,video,iframe").css(u)});var k=t.Event("backstretch.resize",{relatedTarget:this.$container[0]});this.$container.trigger(k,this)}catch(t){}return this},show:function(e,i){if(!(Math.abs(e)>this.images.length-1)){var o=this,r=o.$wrap.find(">.backstretch-item").addClass("deleteable"),a=o.videoWrapper,n={relatedTarget:o.$container[0]};o.$container.trigger(t.Event("backstretch.before",n),[o,e]),this.index=e;var s=o.images[e];clearTimeout(o._cycleTimeout),delete o.videoWrapper;var h=u(s);return h?(o.videoWrapper=new w(s),o.$item=o.videoWrapper.$video.css("pointer-events","none")):o.$item=t("<img />"),o.$itemWrapper=t('<div class="backstretch-item">').append(o.$item),this.options.bypassCss?o.$itemWrapper.css({display:"none"}):(o.$itemWrapper.css(d.itemWrapper),o.$item.css(d.item)),o.$item.bind(h?"canplay":"load",function(s){var c=t(this).parent(),d=c.data("options");i&&(d=t.extend({},d,i));var l=this.naturalWidth||this.videoWidth||this.width,u=this.naturalHeight||this.videoHeight||this.height;c.data("width",l).data("height",u);var p=function(t){return void 0!==d[t]?d[t]:o.options[t]},g=p("transition"),y=p("transitionEasing"),f=p("transitionDuration"),v=function(){a&&(a.stop(),a.destroy()),r.remove(),!o.paused&&o.images.length>1&&o.cycle(),o.options.bypassCss||o.isBody||o.$container.css("background-image","none"),t(["after","show"]).each(function(){o.$container.trigger(t.Event("backstretch."+this,n),[o,e])}),h&&o.videoWrapper.play()};o.firstShow&&!o.options.animateFirst||!f||!g?(c.show(),v()):function(e){var i=e.transition||"fade";"string"==typeof i&&i.indexOf("|")>-1&&(i=i.split("|")),i instanceof Array&&(i=i[Math.round(Math.random()*(i.length-1))]);var o=e.new,r=e.old?e.old:t([]);switch(i.toString().toLowerCase()){default:case"fade":o.fadeIn({duration:e.duration,complete:e.complete,easing:e.easing||void 0});break;case"fadeinout":case"fade_in_out":var a=function(){o.fadeIn({duration:e.duration/2,complete:e.complete,easing:e.easing||void 0})};r.length?r.fadeOut({duration:e.duration/2,complete:a,easing:e.easing||void 0}):a();break;case"pushleft":case"push_left":case"pushright":case"push_right":case"pushup":case"push_up":case"pushdown":case"push_down":case"coverleft":case"cover_left":case"coverright":case"cover_right":case"coverup":case"cover_up":case"coverdown":case"cover_down":var n=i.match(/^(cover|push)_?(.*)$/),s="left"===n[2]?"right":"right"===n[2]?"left":"down"===n[2]?"top":"up"===n[2]?"bottom":"right",h={display:""},c={};if(h[s]="-100%",c[s]=0,o.css(h).animate(c,{duration:e.duration,complete:function(){o.css(s,""),e.complete.apply(this,arguments)},easing:e.easing||void 0}),"push"===n[1]&&r.length){var d={};d[s]="100%",r.animate(d,{duration:e.duration,complete:function(){r.css("display","none")},easing:e.easing||void 0})}}}({new:c,old:r,transition:g,duration:f,easing:y,complete:v}),o.firstShow=!1,o.resize()}),o.$itemWrapper.appendTo(o.$wrap),o.$item.attr("alt",s.alt||""),o.$itemWrapper.data("options",s),h||o.$item.attr("src",s.url),o._currentImage=s,o}},current:function(){return this.index},next:function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift(this.index<this.images.length-1?this.index+1:0),this.show.apply(this,t)},prev:function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift(0===this.index?this.images.length-1:this.index-1),this.show.apply(this,t)},pause:function(){return this.paused=!0,this.videoWrapper&&this.videoWrapper.pause(),this},resume:function(){return this.paused=!1,this.videoWrapper&&this.videoWrapper.play(),this.cycle(),this},cycle:function(){if(this.images.length>1){clearTimeout(this._cycleTimeout);var e=this._currentImage&&this._currentImage.duration||this.options.duration,i=u(this._currentImage),o=function(){this.$item.off(".cycle"),this.paused||this.next()};if(i){if(!this._currentImage.loop){var r=0;this.$item.on("playing.cycle",function(){var e=t(this).data("player");clearTimeout(r),r=setTimeout(function(){e.pause(),e.$video.trigger("ended")},1e3*(e.getDuration()-e.getCurrentTime()))}).on("ended.cycle",function(){clearTimeout(r)})}this.$item.on("error.cycle initerror.cycle",t.proxy(o,this))}i&&!this._currentImage.duration?this.$item.on("ended.cycle",t.proxy(o,this)):this._cycleTimeout=setTimeout(t.proxy(o,this),e)}return this},destroy:function(i){t(e).off("resize.backstretch orientationchange.backstretch"),this.videoWrapper&&this.videoWrapper.destroy(),clearTimeout(this._cycleTimeout),i||this.$wrap.remove(),this.$container.removeData("backstretch")}};var w=function(){this.init.apply(this,arguments)};w.prototype.init=function(i){var r,a=this,n=function(){a.$video=r,a.video=r[0]},s="video";if(i.url instanceof Array||!o.test(i.url)||(s="youtube"),a.type=s,"youtube"===s){w.loadYoutubeAPI(),a.ytId=i.url.match(o)[2];var h="https://www.youtube.com/embed/"+a.ytId+"?rel=0&autoplay=0&showinfo=0&controls=0&modestbranding=1&cc_load_policy=0&disablekb=1&iv_load_policy=3&loop=0&enablejsapi=1&origin="+encodeURIComponent(e.location.origin);a.__ytStartMuted=!!i.mute||void 0===i.mute,r=t("<iframe />").attr({src_to_load:h}).css({border:0,margin:0,padding:0}).data("player",a),i.loop&&r.on("ended.loop",function(){a.__manuallyStopped||a.play()}),a.ytReady=!1,n(),e.YT?(a._initYoutube(),r.trigger("initsuccess")):t(e).one("youtube_api_load",function(){a._initYoutube(),r.trigger("initsuccess")})}else{r=t("<video>").prop("autoplay",!1).prop("controls",!1).prop("loop",!!i.loop).prop("muted",!!i.mute||void 0===i.mute).prop("preload","auto").prop("poster",i.poster||"");for(var c=i.url instanceof Array?i.url:[i.url],d=0;d<c.length;d++){var l=c[d];"string"==typeof l&&(l={src:l}),t("<source>").attr("src",l.src).attr("type",l.type||null).appendTo(r)}r[0].canPlayType&&c.length?r.trigger("initsuccess"):r.trigger("initerror"),n()}},w.prototype._initYoutube=function(){var i=this,o=e.YT;i.$video.attr("src",i.$video.attr("src_to_load")).removeAttr("src_to_load");var r=!!i.$video[0].parentNode;if(!r){var a=t("<div>").css("display","none !important").appendTo(document.body);i.$video.appendTo(a)}var n=new o.Player(i.video,{events:{onReady:function(){i.__ytStartMuted&&n.mute(),r||(i.$video[0].parentNode===a[0]&&i.$video.detach(),a.remove()),i.ytReady=!0,i._updateYoutubeSize(),i.$video.trigger("canplay")},onStateChange:function(t){switch(t.data){case o.PlayerState.PLAYING:i.$video.trigger("playing");break;case o.PlayerState.ENDED:i.$video.trigger("ended");break;case o.PlayerState.PAUSED:i.$video.trigger("pause");break;case o.PlayerState.BUFFERING:i.$video.trigger("waiting");break;case o.PlayerState.CUED:i.$video.trigger("canplay")}},onPlaybackQualityChange:function(){i._updateYoutubeSize(),i.$video.trigger("resize")},onError:function(t){i.hasError=!0,i.$video.trigger({type:"error",error:t})}}});return i.ytPlayer=n,i},w.prototype._updateYoutubeSize=function(){switch(this.ytPlayer.getPlaybackQuality()||"medium"){case"small":this.video.videoWidth=426,this.video.videoHeight=240;break;case"medium":this.video.videoWidth=640,this.video.videoHeight=360;break;default:case"large":this.video.videoWidth=854,this.video.videoHeight=480;break;case"hd720":this.video.videoWidth=1280,this.video.videoHeight=720;break;case"hd1080":this.video.videoWidth=1920,this.video.videoHeight=1080;break;case"highres":this.video.videoWidth=2560,this.video.videoHeight=1440}return this},w.prototype.play=function(){return this.__manuallyStopped=!1,"youtube"===this.type?this.ytReady&&(this.$video.trigger("play"),this.ytPlayer.playVideo()):this.video.play(),this},w.prototype.pause=function(){return this.__manuallyStopped=!1,"youtube"===this.type?this.ytReady&&this.ytPlayer.pauseVideo():this.video.pause(),this},w.prototype.stop=function(){return this.__manuallyStopped=!0,"youtube"===this.type?this.ytReady&&(this.ytPlayer.pauseVideo(),this.ytPlayer.seekTo(0)):(this.video.pause(),this.video.currentTime=0),this},w.prototype.destroy=function(){return this.ytPlayer&&this.ytPlayer.destroy(),this.$video.remove(),this},w.prototype.getCurrentTime=function(t){return"youtube"!==this.type?this.video.currentTime:this.ytReady?this.ytPlayer.getCurrentTime():0},w.prototype.setCurrentTime=function(t){return"youtube"===this.type?this.ytReady&&this.ytPlayer.seekTo(t,!0):this.video.currentTime=t,this},w.prototype.getDuration=function(){return"youtube"!==this.type?this.video.duration:this.ytReady?this.ytPlayer.getDuration():0},w.loadYoutubeAPI=function(){if(!e.YT){t("script[src*=www\\.youtube\\.com\\/iframe_api]").length||t('<script type="text/javascript" src="https://www.youtube.com/iframe_api">').appendTo("body");var i=setInterval(function(){e.YT&&e.YT.loaded&&(t(e).trigger("youtube_api_load"),clearTimeout(i))},50)}};var _,$,T,k,x,W,R,I,Y,P,C=function(){if("matchMedia"in e){if(e.matchMedia("(orientation: portrait)").matches)return"portrait";if(e.matchMedia("(orientation: landscape)").matches)return"landscape"}return screen.height>screen.width?"portrait":"landscape"},S=function(){return e.innerHeight>e.innerWidth?"portrait":e.innerWidth>e.innerHeight?"landscape":"square"},z=(_=navigator.userAgent,$=navigator.platform,T=_.match(/AppleWebKit\/([0-9]+)/),k=!!T&&T[1],x=_.match(/Fennec\/([0-9]+)/),W=!!x&&x[1],R=_.match(/Opera Mobi\/([0-9]+)/),I=!!R&&R[1],Y=_.match(/MSIE ([0-9]+)/),P=!!Y&&Y[1],!(($.indexOf("iPhone")>-1||$.indexOf("iPad")>-1||$.indexOf("iPod")>-1)&&k&&k<534||e.operamini&&"[object OperaMini]"==={}.toString.call(e.operamini)||R&&I<7458||_.indexOf("Android")>-1&&k&&k<533||W&&W<6||"palmGetResource"in e&&k&&k<534||_.indexOf("MeeGo")>-1&&_.indexOf("NokiaBrowser/8.5.0")>-1||P&&P<=6))}(jQuery,window);
\ No newline at end of file

From 477bfb08e754ebe421c57f7875b74bbdfd64ec4c Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 16:55:36 -0400
Subject: [PATCH 07/44] Update block script

---
 includes/js/test-block.js     | 13 +++++++------
 includes/js/test-block.min.js |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/js/test-block.js b/includes/js/test-block.js
index 44a97c3..f9b88a0 100644
--- a/includes/js/test-block.js
+++ b/includes/js/test-block.js
@@ -40,7 +40,7 @@
 				      BlockAlignmentToolbar = wp.editor.BlockAlignmentToolbar;
 				return [
 					DFIGBlockObject.el( ServerSideRender, {
-						block: DFIGBlockObject.params.block,
+						block: params.block,
 						attributes: attributes
 					} ),
 					DFIGBlockObject.el( Fragment, null,
@@ -55,7 +55,7 @@
 						),
 					),
 					DFIGBlockObject.el( InspectorControls, {},
-						_getPanels( props )
+						_getPanels( props, params )
 					)
 				];
 			},
@@ -70,15 +70,16 @@
 	 * Get the panels for the block controls.
 	 *
 	 * @param props
+	 * @param params
 	 * @return {Array}
 	 * @private
 	 */
-	function _getPanels( props ) {
+	function _getPanels( props, params ) {
 		const panels    = [],
 		      PanelBody = wp.components.PanelBody;
-		Object.keys( DFIGBlockObject.params.panels ).forEach( function ( key, index ) {
-			if ( DFIGBlockObject.params.panels.hasOwnProperty( key ) ) {
-				const IndividualPanel = DFIGBlockObject.params.panels[key];
+		Object.keys( params.panels ).forEach( function ( key, index ) {
+			if ( params.panels.hasOwnProperty( key ) ) {
+				const IndividualPanel = params.panels[key];
 				panels[index] = DFIGBlockObject.el( PanelBody, {
 					title: IndividualPanel.title,
 					initialOpen: IndividualPanel.initialOpen,
diff --git a/includes/js/test-block.min.js b/includes/js/test-block.min.js
index 34bbd44..2c80c7d 100644
--- a/includes/js/test-block.min.js
+++ b/includes/js/test-block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:t=>{const{attributes:o,setAttributes:i}=t,s=e.element.Fragment,a=e.editor.BlockControls,c=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:n.params.block,attributes:o}),n.el(s,null,n.el(a,null,n.el(c,{value:o.blockAlignment,controls:["wide","full"],onChange:e=>{i({blockAlignment:e})}}))),n.el(r,{},function(t){const o=[],l=e.components.PanelBody;return Object.keys(n.params.panels).forEach(function(r,i){if(n.params.panels.hasOwnProperty(r)){const s=n.params.panels[r];o[i]=n.el(l,{title:s.title,initialOpen:s.initialOpen,className:"scriptless-panel-"+r},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,s.attributes))}}),o}(t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&n.init(n.params)}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,i=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:r,setAttributes:s}=o,c=e.element.Fragment,a=e.editor.BlockControls,u=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:r}),n.el(c,null,n.el(a,null,n.el(u,{value:r.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(i,{},function(t,o){const l=[],i=e.components.PanelBody;return Object.keys(o.panels).forEach(function(r,s){if(o.panels.hasOwnProperty(r)){const c=o.panels[r];l[s]=n.el(i,{title:c.title,initialOpen:c.initialOpen,className:"scriptless-panel-"+r},function(t,o){const l=[];return Object.keys(o).forEach(function(i,r){if(o.hasOwnProperty(i)){if(-1!==["blockAlignment","className"].indexOf(i))return;const s=o[i],c=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:i,CheckboxControl:r,TextareaControl:s}=e.components,c=o;return"select"===t?l:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?s:c}(s.method,s.type);l[r]=n.el(c,function(e,t,n){const{attributes:o,setAttributes:l}=n,i={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?i.options=t.options:"number"===t.method?(i.min=t.min,i.max=t.max,"number"!==t.type?i.type="number":i.initialPosition=t.min):"checkbox"===t.method&&(i.checked=o[e]),i}(i,s,t))}}),l}(t,c.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&n.init(n.params)}(wp);
\ No newline at end of file

From ae0f537416a0c88bc062477f2a4937cbfe59a8d6 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 17:37:16 -0400
Subject: [PATCH 08/44] Initial work to get multiple blocks out of one go

---
 includes/js/test-block.js                     |   6 +-
 includes/js/test-block.min.js                 |   2 +-
 ...splayfeaturedimagegenesis-output-block.php | 154 ++++++++++++------
 3 files changed, 113 insertions(+), 49 deletions(-)

diff --git a/includes/js/test-block.js b/includes/js/test-block.js
index f9b88a0..ec702e5 100644
--- a/includes/js/test-block.js
+++ b/includes/js/test-block.js
@@ -186,6 +186,10 @@
 	DFIGBlockObject.params = typeof DisplayFeaturedImageTestBlock === 'undefined' ? '' : DisplayFeaturedImageTestBlock;
 
 	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
-		DFIGBlockObject.init( DFIGBlockObject.params );
+		Object.keys( DFIGBlockObject.params ).forEach( function ( key, index ) {
+			if ( DFIGBlockObject.params.hasOwnProperty( key ) ) {
+				DFIGBlockObject.init( DFIGBlockObject.params[ key ] );
+			}
+		} );
 	}
 } )( wp );
diff --git a/includes/js/test-block.min.js b/includes/js/test-block.min.js
index 2c80c7d..6d2f3dd 100644
--- a/includes/js/test-block.min.js
+++ b/includes/js/test-block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,i=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:r,setAttributes:s}=o,c=e.element.Fragment,a=e.editor.BlockControls,u=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:r}),n.el(c,null,n.el(a,null,n.el(u,{value:r.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(i,{},function(t,o){const l=[],i=e.components.PanelBody;return Object.keys(o.panels).forEach(function(r,s){if(o.panels.hasOwnProperty(r)){const c=o.panels[r];l[s]=n.el(i,{title:c.title,initialOpen:c.initialOpen,className:"scriptless-panel-"+r},function(t,o){const l=[];return Object.keys(o).forEach(function(i,r){if(o.hasOwnProperty(i)){if(-1!==["blockAlignment","className"].indexOf(i))return;const s=o[i],c=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:i,CheckboxControl:r,TextareaControl:s}=e.components,c=o;return"select"===t?l:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?s:c}(s.method,s.type);l[r]=n.el(c,function(e,t,n){const{attributes:o,setAttributes:l}=n,i={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?i.options=t.options:"number"===t.method?(i.min=t.min,i.max=t.max,"number"!==t.type?i.type="number":i.initialPosition=t.min):"checkbox"===t.method&&(i.checked=o[e]),i}(i,s,t))}}),l}(t,c.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&n.init(n.params)}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:i,setAttributes:s}=o,a=e.element.Fragment,c=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:i}),n.el(a,null,n.el(c,null,n.el(m,{value:i.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(r,{},function(t,o){const l=[],r=e.components.PanelBody;return Object.keys(o.panels).forEach(function(i,s){if(o.panels.hasOwnProperty(i)){const a=o.panels[i];l[s]=n.el(r,{title:a.title,initialOpen:a.initialOpen,className:"scriptless-panel-"+i},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index 8139b21..5c30912 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -4,7 +4,7 @@
  */
 
 /**
- * Class ScriptlessSocialSharingOutputBlock
+ * Class DisplayFeaturedImageGenesisOutputBlock
  */
 class DisplayFeaturedImageGenesisOutputBlock {
 
@@ -13,12 +13,12 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 *
 	 * @var string
 	 */
-	protected $name = 'displayfeaturedimagegenesis/post-type';
+	protected $name = 'displayfeaturedimagegenesis/';
 
 	/**
 	 * @var string
 	 */
-	protected $block = 'displayfeaturedimagegenesis-post-type';
+	protected $block = 'displayfeaturedimagegenesis-';
 
 	/**
 	 * The plugin setting.
@@ -31,17 +31,56 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 */
 	public function init() {
 		$this->register_script_style();
-		register_block_type(
-			$this->name,
-			array(
-				'editor_script'   => $this->block . '-block',
-				'attributes'      => $this->fields(),
-				'render_callback' => array( $this, 'render' ),
-			)
-		);
+		foreach ( $this->blocks() as $block => $data ) {
+			if ( empty( $data['nickname'] ) || ! is_callable( array( $this, "render_{$data['nickname']}" ) ) ) {
+				continue;
+			}
+			register_block_type(
+				"{$this->name}{$block}",
+				array(
+					'editor_script'   => "{$this->block}block",
+					'attributes'      => $this->fields( $block ),
+					'render_callback' => array( $this, "render_{$data['nickname']}" ),
+				)
+			);
+		}
 		add_action( 'enqueue_block_editor_assets', array( $this, 'localize' ) );
 	}
 
+	/**
+	 * Get the list of blocks to create.
+	 * @return array
+	 */
+	private function blocks() {
+		return array(
+			'term'      => array(
+				'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Term', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+			),
+			'author'    => array(
+				'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Author', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+			),
+			'post-type' => array(
+				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
+				'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
+				'keywords'    => array(
+					__( 'Post Type', 'display-featured-image-genesis' ),
+					__( 'Featured Image', 'display-featured-image-genesis' ),
+				),
+				'nickname'    => 'cpt',
+			),
+		);
+	}
+
 	/**
 	 * Render the widget in a container div.
 	 *
@@ -49,14 +88,14 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 *
 	 * @return string
 	 */
-	public function render( $atts ) {
+	public function render_cpt( $atts ) {
 		$atts      = wp_parse_args( $atts, include 'fields/cpt-defaults.php' );
 		$post_type = get_post_type_object( $atts['post_type'] );
 		if ( ! $post_type ) {
 			return '';
 		}
 
-		$classes = $this->get_block_classes( $atts );
+		$classes = $this->get_block_classes( $atts, 'post-type' );
 		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
 		$output = '<div class="' . implode( ' ', $classes ) . '">';
 		ob_start();
@@ -74,9 +113,9 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 *
 	 * @return array
 	 */
-	private function get_block_classes( $atts ) {
-		array(
-			'wp-block-' . $this->block,
+	private function get_block_classes( $atts, $block_id ) {
+		$classes = array(
+			"wp-block-{$this->block}{$block_id}",
 		);
 		if ( ! empty( $atts['className'] ) ) {
 			$classes[] = $atts['className'];
@@ -93,12 +132,12 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 */
 	public function register_script_style() {
 		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
-		$version = '3.2.0';
+		$version = displayfeaturedimagegenesis_get()->version;
 		if ( ! $minify ) {
 			$version .= current_time( 'gmt' );
 		}
 		wp_register_script(
-			$this->block . '-block',
+			"{$this->block}block",
 			plugin_dir_url( dirname( __FILE__ ) ) . "js/test-block{$minify}.js",
 			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
 			$version,
@@ -110,7 +149,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 * Localize.
 	 */
 	public function localize() {
-		wp_localize_script( $this->block . '-block', 'DisplayFeaturedImageTestBlock', $this->get_localization_data() );
+		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageTestBlock', $this->get_localization_data() );
 	}
 
 	/**
@@ -118,33 +157,46 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 * @return array
 	 */
 	protected function get_localization_data() {
-		return array(
-			'block'       => $this->name,
-			'title'       => __( 'Display Featured Image Genesis Post Type', 'scriptless-social-sharing' ),
-			'description' => __( 'featured image.', 'scriptless-social-sharing' ),
-			'keywords'    => array(
-				__( 'image', 'scriptless-social-sharing' ),
-				__( 'featured', 'scriptless-social-sharing' ),
-			),
-			'panels'      => array(
-				'main' => array(
-					'title'       => __( 'Block Settings', 'scriptless-social-sharing' ),
-					'initialOpen' => true,
-					'attributes'  => $this->fields(),
-				),
-			),
-			'icon'        => 'format-image',
-			'category'    => 'widgets',
+		$blocks = $this->blocks();
+		$common = array(
+			'icon'     => 'format-image',
+			'category' => 'widgets',
 		);
+		$output = array();
+		foreach ( $blocks as $block => $data ) {
+			if ( empty( $data['nickname'] ) || ! is_callable( array( $this, "render_{$data['nickname']}" ) ) ) {
+				continue;
+			}
+			$common['panels'] = array(
+				'main' => array(
+					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
+					'initialOpen' => true,
+					'attributes'  => $this->fields( $block ),
+				),
+			);
+			$common['block']  = "{$this->name}{$block}";
+			if ( ! empty( $data['nickname'] ) ) {
+				$block = $data['nickname'];
+			}
+			$output[ $block ] = array_merge(
+				$data,
+				$common
+			);
+		}
+
+		return $output;
 	}
 
 	/**
 	 * Get the fields for the block.
+	 *
+	 * @param $block
+	 *
 	 * @return array
 	 */
-	private function fields() {
+	private function fields( $block ) {
 		$output = array();
-		foreach ( $this->get_all_fields() as $key => $value ) {
+		foreach ( $this->get_all_fields( $block ) as $key => $value ) {
 			if ( ! empty( $value['args']['id'] ) ) {
 				$key = $value['args']['id'];
 			}
@@ -154,14 +206,11 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		return $output;
 	}
 
-	private function get_all_fields() {
-		$form       = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
-		$fields     = array_merge(
-			include 'fields/cpt-post_type.php',
-			include 'fields/text.php',
-			include 'fields/image.php',
-			include 'fields/archive.php'
-		);
+	private function get_all_fields( $block ) {
+		if ( 'post-type' === $block ) {
+			$block = 'cpt';
+		}
+		$fields     = "{$block}_fields";
 		$attributes = array_merge(
 			array(
 				'blockAlignment' => array(
@@ -181,12 +230,23 @@ class DisplayFeaturedImageGenesisOutputBlock {
 					),
 				),
 			),
-			$fields
+			$this->$fields()
 		);
 
 		return $attributes;
 	}
 
+	protected function cpt_fields() {
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+
+		return array_merge(
+			include 'fields/cpt-post_type.php',
+			include 'fields/text.php',
+			include 'fields/image.php',
+			include 'fields/archive.php'
+		);
+	}
+
 	/**
 	 * Get an array of attributes for an individual field.
 	 *

From bc801e7756fc192966f1caecb4ba061408d693a8 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 23 Jun 2019 17:39:57 -0400
Subject: [PATCH 09/44] Delete non-working block code

---
 ...ass-displayfeaturedimagegenesis-blocks.php | 261 ------------------
 .../class-displayfeaturedimagegenesis.php     |   3 -
 includes/js/block.js                          |  75 ++---
 includes/js/block.min.js                      |   2 +-
 includes/js/test-block.js                     | 195 -------------
 includes/js/test-block.min.js                 |   1 -
 ...splayfeaturedimagegenesis-output-block.php |   4 +-
 7 files changed, 43 insertions(+), 498 deletions(-)
 delete mode 100644 includes/blocks/class-displayfeaturedimagegenesis-blocks.php
 delete mode 100644 includes/js/test-block.js
 delete mode 100644 includes/js/test-block.min.js

diff --git a/includes/blocks/class-displayfeaturedimagegenesis-blocks.php b/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
deleted file mode 100644
index 2de54ca..0000000
--- a/includes/blocks/class-displayfeaturedimagegenesis-blocks.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-/**
- * Class DisplayFeaturedImageGenesisBlocks
- */
-class DisplayFeaturedImageGenesisBlocks {
-
-	/**
-	 *
-	 */
-	public function init() {
-		$this->register_script_style();
-		foreach ( $this->blocks() as $block => $data ) {
-			if ( 'term' === $block ) {
-				continue;
-			}
-			register_block_type(
-				"display-featured-image-genesis/{$block}",
-				array(
-					'editor_script'   => 'displayfeaturedimagegenesis-block',
-					'attributes'      => $this->get_attributes( $block ),
-					'render_callback' => array( $this, 'render' ),
-				)
-			);
-		}
-		add_action( 'enqueue_block_editor_assets', array( $this, 'localize' ) );
-	}
-
-	/**
-	 * Register the block script and style.
-	 */
-	public function register_script_style() {
-		$version = displayfeaturedimagegenesis_get()->version;
-		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
-		if ( ! $minify ) {
-			$version .= current_time( 'gmt' );
-		}
-		wp_register_script(
-			'displayfeaturedimagegenesis-block',
-			plugin_dir_url( dirname( __FILE__ ) ) . "js/block{$minify}.js",
-			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
-			$version,
-			false
-		);
-	}
-
-	/**
-	 * Get the list of blocks to create.
-	 * @return array
-	 */
-	private function blocks() {
-		return array(
-			'term'      => array(
-				'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Term', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-			),
-			'author'    => array(
-				'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Author', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-			),
-			'post-type' => array(
-				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Post Type', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Render the widget in a container div.
-	 *
-	 * @param $attributes
-	 *
-	 * @return string
-	 */
-	public function render( $attributes ) {
-		rgc_error_log( $attributes );
-//		$classes = $this->get_block_classes( $attributes );
-//		$output  = '<div class="' . implode( ' ', $classes ) . '">';
-////		$output .= $this->register->shortcode( $attributes );
-//		$output .= '</div>';
-
-		return 'this is the output';
-	}
-
-	/**
-	 * Get the block classes.
-	 *
-	 * @param $attributes
-	 *
-	 * @return array
-	 * @since 0.4.0
-	 */
-	private function get_block_classes( $attributes ) {
-		$classes = array(
-			'wp-block-displayfeaturedimagegenesis' . 'term',
-		);
-		if ( ! empty( $attributes['className'] ) ) {
-			$classes[] = $attributes['className'];
-		}
-		if ( ! empty( $attributes['blockAlignment'] ) ) {
-			$classes[] = 'align' . $attributes['blockAlignment'];
-		}
-
-		return $classes;
-	}
-
-	/**
-	 * @param $block
-	 *
-	 * @return array
-	 */
-	protected function get_attributes( $block ) {
-		$attributes = array_merge(
-			$this->fields(),
-			$this->get_block_fields( $block )
-		);
-		foreach ( $attributes as $key => $value ) {
-			$attributes[ $key ] = $this->get_individual_field_attributes( $value, $key );
-		}
-
-		return $attributes;
-	}
-
-	/**
-	 *
-	 */
-	public function localize() {
-		$args = array();
-		foreach ( $this->blocks() as $block => $data ) {
-			$args[ $block ] = $this->get_localization_data( $block, $data );
-		}
-		wp_localize_script( 'displayfeaturedimagegenesis-block', 'DisplayFeaturedImageGenesisBlock', $args );
-	}
-
-	/**
-	 * Get the data for localizing everything.
-	 *
-	 * @param $block
-	 * @param $data
-	 *
-	 * @return array
-	 */
-	protected function get_localization_data( $block, $data ) {
-		return array(
-			'block'       => "displayfeaturedimagegenesis/{$block}",
-			'title'       => $data['title'],
-			'description' => $data['description'],
-			'keywords'    => $data['keywords'],
-			'panels'      => array(
-				'main' => array(
-					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
-					'initialOpen' => true,
-					'attributes'  => $this->get_attributes( $block ),
-				),
-			),
-			'icon'        => 'format-image',
-			'category'    => 'widgets',
-		);
-	}
-
-	/**
-	 * @return array
-	 */
-	private function fields() {
-		return array(
-			'blockAlignment' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'className'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'title'          => array(
-				'type'    => 'string',
-				'default' => '',
-				'label'   => __( 'Title', 'display-featured-image-genesis' ),
-			),
-			'show_image'     => array(
-				'type'    => 'boolean',
-				'default' => 1,
-				'label'   => __( 'Show Featured Image', 'display-featured-image-genesis' ),
-				'method'  => 'checkbox',
-			),
-			'image_size'     => array(
-				'type'    => 'string',
-				'default' => 'medium',
-				'label'   => __( 'Image Size:', 'display-featured-image-genesis' ),
-				'method'  => 'select',
-				'choices' => $this->get_image_size(),
-			),
-		);
-	}
-
-	/**
-	 * Get an array of attributes for an individual field.
-	 *
-	 * @param $field
-	 * @param $id
-	 *
-	 * @return array
-	 */
-	protected function get_individual_field_attributes( $field, $id ) {
-		$field_type = $field['type'];
-		if ( empty( $field['label'] ) ) {
-			return $field;
-		}
-		$attributes = array(
-			'type'    => $field['type'],
-			'default' => $field['default'],
-			'label'   => $field['label'],
-			'method'  => empty( $field['method'] ) ? 'text' : $field['method'],
-		);
-		if ( in_array( 'number', array( $field_type, $attributes['method'] ), true ) ) {
-			$attributes['min'] = $field['args']['min'];
-			$attributes['max'] = $field['args']['max'];
-		} elseif ( 'select' === $attributes['method'] ) {
-			foreach ( $field['choices'] as $value => $label ) {
-				$attributes['options'][] = array(
-					'value' => $value,
-					'label' => $label,
-				);
-			}
-		} elseif ( 'boolean' === $field_type ) {
-			$attributes['default'] = 0;
-		}
-
-		return $attributes;
-	}
-
-	private function get_image_size() {
-		$sizes   = genesis_get_image_sizes();
-		$options = array();
-		foreach ( (array) $sizes as $name => $size ) {
-			$options[ $name ] = sprintf( '%s ( %s x %s )', esc_html( $name ), (int) $size['width'], (int) $size['height'] );
-		}
-
-		return $options;
-	}
-
-	/**
-	 * @param $block
-	 *
-	 * @return array
-	 */
-	private function get_block_fields( $block ) {
-		return array();
-	}
-}
diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index 5735ef6..7b48c19 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -254,9 +254,6 @@ class Display_Featured_Image_Genesis {
 		if ( ! function_exists( 'register_block_type' ) ) {
 			return;
 		}
-//		include_once 'blocks/class-displayfeaturedimagegenesis-blocks.php';
-//		$blocks = new DisplayFeaturedImageGenesisBlocks();
-//		$blocks->init();
 		include_once 'widgets/class-displayfeaturedimagegenesis-output-block.php';
 		$block = new DisplayFeaturedImageGenesisOutputBlock();
 		$block->init();
diff --git a/includes/js/block.js b/includes/js/block.js
index 1dd7b11..f6a8ea4 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -4,22 +4,24 @@
 
 (function ( wp, undefined ) {
 	'use strict';
-	const DisplayFeaturedImageBlockObject = {
+	const DFIGBlockObject = {
 		el: wp.element.createElement,
 	};
 
-	DisplayFeaturedImageBlockObject.takeTwo = function ( block ) {
+	/**
+	 * Initialize and register the block.
+	 */
+	DFIGBlockObject.init = function ( params ) {
 		const registerBlockType = wp.blocks.registerBlockType,
 		      ServerSideRender  = wp.components.ServerSideRender,
-		      InspectorControls = wp.blockEditor.InspectorControls;
-		const data = DisplayFeaturedImageBlockObject.params[block];
-		// console.log( data );
-		registerBlockType( data.block, {
-			title: data.title,
-			description: data.description,
-			keywords: data.keywords,
-			icon: data.icon,
-			category: data.category,
+		      InspectorControls = wp.editor.InspectorControls;
+
+		registerBlockType( params.block, {
+			title: params.title,
+			description: params.description,
+			keywords: params.keywords,
+			icon: params.icon,
+			category: params.category,
 			supports: {
 				html: false
 			},
@@ -34,17 +36,17 @@
 					      setAttributes
 				      }                     = props,
 				      Fragment              = wp.element.Fragment,
-				      BlockControls         = wp.blockEditor.BlockControls,
-				      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
+				      BlockControls         = wp.editor.BlockControls,
+				      BlockAlignmentToolbar = wp.editor.BlockAlignmentToolbar;
 				return [
-					DisplayFeaturedImageBlockObject.el( ServerSideRender, {
-						block: data.block,
-						attributes: data.attributes
+					DFIGBlockObject.el( ServerSideRender, {
+						block: params.block,
+						attributes: attributes
 					} ),
-					DisplayFeaturedImageBlockObject.el( Fragment, null,
-						DisplayFeaturedImageBlockObject.el( BlockControls, null,
-							DisplayFeaturedImageBlockObject.el( BlockAlignmentToolbar, {
-								value: props.attributes.blockAlignment,
+					DFIGBlockObject.el( Fragment, null,
+						DFIGBlockObject.el( BlockControls, null,
+							DFIGBlockObject.el( BlockAlignmentToolbar, {
+								value: attributes.blockAlignment,
 								controls: ['wide', 'full'],
 								onChange: ( value ) => {
 									setAttributes( {blockAlignment: value} );
@@ -52,8 +54,8 @@
 							} )
 						),
 					),
-					DisplayFeaturedImageBlockObject.el( InspectorControls, {},
-						_getPanels( props, block )
+					DFIGBlockObject.el( InspectorControls, {},
+						_getPanels( props, params )
 					)
 				];
 			},
@@ -68,20 +70,20 @@
 	 * Get the panels for the block controls.
 	 *
 	 * @param props
-	 * @param block
+	 * @param params
 	 * @return {Array}
 	 * @private
 	 */
-	function _getPanels( props, block ) {
+	function _getPanels( props, params ) {
 		const panels    = [],
 		      PanelBody = wp.components.PanelBody;
-		const blockData = DisplayFeaturedImageBlockObject.params[block];
-		Object.keys( blockData.panels ).forEach( function ( key, index ) {
-			if ( blockData.panels.hasOwnProperty( key ) ) {
-				const IndividualPanel = blockData.panels[key];
-				panels[index] = DisplayFeaturedImageBlockObject.el( PanelBody, {
+		Object.keys( params.panels ).forEach( function ( key, index ) {
+			if ( params.panels.hasOwnProperty( key ) ) {
+				const IndividualPanel = params.panels[key];
+				panels[index] = DFIGBlockObject.el( PanelBody, {
 					title: IndividualPanel.title,
-					initialOpen: IndividualPanel.initialOpen
+					initialOpen: IndividualPanel.initialOpen,
+					className: 'scriptless-panel-' + key
 				}, _getControls( props, IndividualPanel.attributes ) );
 			}
 		} );
@@ -107,7 +109,7 @@
 				}
 				const IndividualField = fields[key],
 				      control         = _getControlType( IndividualField.method, IndividualField.type );
-				controls[index] = DisplayFeaturedImageBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
+				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
 			}
 		} );
 
@@ -156,7 +158,6 @@
 	function _getIndividualControl( key, field, props ) {
 		const {attributes, setAttributes} = props;
 		const control = {
-			heading: field.heading,
 			label: field.label,
 			value: attributes[key],
 			className: 'displayfeaturedimagegenesis-' + key,
@@ -182,9 +183,13 @@
 		return control;
 	}
 
-	DisplayFeaturedImageBlockObject.params = typeof DisplayFeaturedImageGenesisBlock === 'undefined' ? '' : DisplayFeaturedImageGenesisBlock;
+	DFIGBlockObject.params = typeof DisplayFeaturedImageBlock === 'undefined' ? '' : DisplayFeaturedImageBlock;
 
-	if ( typeof DisplayFeaturedImageBlockObject.params !== 'undefined' ) {
-		DisplayFeaturedImageBlockObject.takeTwo( 'post-type' );
+	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
+		Object.keys( DFIGBlockObject.params ).forEach( function ( key, index ) {
+			if ( DFIGBlockObject.params.hasOwnProperty( key ) ) {
+				DFIGBlockObject.init( DFIGBlockObject.params[ key ] );
+			}
+		} );
 	}
 } )( wp );
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index e396e57..cc89cca 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};n.takeTwo=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,i=e.blockEditor.InspectorControls,r=n.params[t];o(r.block,{title:r.title,description:r.description,keywords:r.keywords,icon:r.icon,category:r.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:s,setAttributes:a}=o,c=e.element.Fragment,u=e.blockEditor.BlockControls,m=e.blockEditor.BlockAlignmentToolbar;return[n.el(l,{block:r.block,attributes:r.attributes}),n.el(c,null,n.el(u,null,n.el(m,{value:o.attributes.blockAlignment,controls:["wide","full"],onChange:e=>{a({blockAlignment:e})}}))),n.el(i,{},function(t,o){const l=[],i=e.components.PanelBody,r=n.params[o];return Object.keys(r.panels).forEach(function(o,s){if(r.panels.hasOwnProperty(o)){const a=r.panels[o];l[s]=n.el(i,{title:a.title,initialOpen:a.initialOpen},function(t,o){const l=[];return Object.keys(o).forEach(function(i,r){if(o.hasOwnProperty(i)){if(-1!==["blockAlignment","className"].indexOf(i))return;const s=o[i],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:i,CheckboxControl:r,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?s:a}(s.method,s.type);l[r]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,i={heading:t.heading,label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?i.options=t.options:"number"===t.method?(i.min=t.min,i.max=t.max,"number"!==t.type?i.type="number":i.initialPosition=t.min):"checkbox"===t.method&&(i.checked=o[e]),i}(i,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageGenesisBlock?"":DisplayFeaturedImageGenesisBlock,void 0!==n.params&&n.takeTwo("post-type")}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:i,setAttributes:s}=o,a=e.element.Fragment,c=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:i}),n.el(a,null,n.el(c,null,n.el(m,{value:i.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(r,{},function(t,o){const l=[],r=e.components.PanelBody;return Object.keys(o.panels).forEach(function(i,s){if(o.panels.hasOwnProperty(i)){const a=o.panels[i];l[s]=n.el(r,{title:a.title,initialOpen:a.initialOpen,className:"scriptless-panel-"+i},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
diff --git a/includes/js/test-block.js b/includes/js/test-block.js
deleted file mode 100644
index ec702e5..0000000
--- a/includes/js/test-block.js
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2019 Robin Cornett
- */
-
-(function ( wp, undefined ) {
-	'use strict';
-	const DFIGBlockObject = {
-		el: wp.element.createElement,
-	};
-
-	/**
-	 * Initialize and register the block.
-	 */
-	DFIGBlockObject.init = function ( params ) {
-		const registerBlockType = wp.blocks.registerBlockType,
-		      ServerSideRender  = wp.components.ServerSideRender,
-		      InspectorControls = wp.editor.InspectorControls;
-
-		registerBlockType( params.block, {
-			title: params.title,
-			description: params.description,
-			keywords: params.keywords,
-			icon: params.icon,
-			category: params.category,
-			supports: {
-				html: false
-			},
-
-			getEditWrapperProps( {blockAlignment} ) {
-				return {'data-align': blockAlignment};
-			},
-
-			edit: props => {
-				const {
-					      attributes,
-					      setAttributes
-				      }                     = props,
-				      Fragment              = wp.element.Fragment,
-				      BlockControls         = wp.editor.BlockControls,
-				      BlockAlignmentToolbar = wp.editor.BlockAlignmentToolbar;
-				return [
-					DFIGBlockObject.el( ServerSideRender, {
-						block: params.block,
-						attributes: attributes
-					} ),
-					DFIGBlockObject.el( Fragment, null,
-						DFIGBlockObject.el( BlockControls, null,
-							DFIGBlockObject.el( BlockAlignmentToolbar, {
-								value: attributes.blockAlignment,
-								controls: ['wide', 'full'],
-								onChange: ( value ) => {
-									setAttributes( {blockAlignment: value} );
-								},
-							} )
-						),
-					),
-					DFIGBlockObject.el( InspectorControls, {},
-						_getPanels( props, params )
-					)
-				];
-			},
-
-			save: props => {
-				return null;
-			},
-		} );
-	};
-
-	/**
-	 * Get the panels for the block controls.
-	 *
-	 * @param props
-	 * @param params
-	 * @return {Array}
-	 * @private
-	 */
-	function _getPanels( props, params ) {
-		const panels    = [],
-		      PanelBody = wp.components.PanelBody;
-		Object.keys( params.panels ).forEach( function ( key, index ) {
-			if ( params.panels.hasOwnProperty( key ) ) {
-				const IndividualPanel = params.panels[key];
-				panels[index] = DFIGBlockObject.el( PanelBody, {
-					title: IndividualPanel.title,
-					initialOpen: IndividualPanel.initialOpen,
-					className: 'scriptless-panel-' + key
-				}, _getControls( props, IndividualPanel.attributes ) );
-			}
-		} );
-
-		return panels;
-	}
-
-	/**
-	 * Get all of the block controls, with defaults and options.
-	 *
-	 * @param props
-	 * @param fields
-	 * @return {Array}
-	 * @private
-	 */
-	function _getControls( props, fields ) {
-		const controls = [];
-		Object.keys( fields ).forEach( function ( key, index ) {
-			if ( fields.hasOwnProperty( key ) ) {
-				var skipped = [ 'blockAlignment', 'className' ];
-				if ( -1 !== skipped.indexOf( key ) ) {
-					return;
-				}
-				const IndividualField = fields[key],
-				      control         = _getControlType( IndividualField.method, IndividualField.type );
-				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
-			}
-		} );
-
-		return controls;
-	}
-
-	/**
-	 * Get the control type.
-	 * @param method
-	 * @param control_type
-	 * @return {*}
-	 * @private
-	 */
-	function _getControlType( method, control_type ) {
-		const {
-			      TextControl,
-			      SelectControl,
-			      RangeControl,
-			      CheckboxControl,
-			      TextareaControl
-		      } = wp.components;
-		const control = TextControl;
-		if ( 'select' === method ) {
-			return SelectControl;
-		} else if ( 'number' === method && 'number' === control_type ) {
-			return RangeControl;
-		} else if ( 'checkbox' === method ) {
-			return CheckboxControl;
-		} else if ( 'textarea' === method ) {
-			return TextareaControl;
-		}
-
-		return control;
-	}
-
-	/**
-	 * Build the individual control object. Sets up standard properties for all
-	 * controls; then adds custom properties as needed.
-	 *
-	 * @param key
-	 * @param field
-	 * @param props
-	 * @return {{label: *, value: *, className: string, onChange: onChange}}
-	 * @private
-	 */
-	function _getIndividualControl( key, field, props ) {
-		const {attributes, setAttributes} = props;
-		const control = {
-			label: field.label,
-			value: attributes[key],
-			className: 'displayfeaturedimagegenesis-' + key,
-			onChange: ( value ) => {
-				setAttributes( {[key]: value} );
-			}
-		};
-
-		if ( 'select' === field.method ) {
-			control.options = field.options;
-		} else if ( 'number' === field.method ) {
-			control.min = field.min;
-			control.max = field.max;
-			if ( 'number' !== field.type ) {
-				control.type = 'number';
-			} else {
-				control.initialPosition = field.min;
-			}
-		} else if ( 'checkbox' === field.method ) {
-			control.checked = attributes[key];
-		}
-
-		return control;
-	}
-
-	DFIGBlockObject.params = typeof DisplayFeaturedImageTestBlock === 'undefined' ? '' : DisplayFeaturedImageTestBlock;
-
-	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
-		Object.keys( DFIGBlockObject.params ).forEach( function ( key, index ) {
-			if ( DFIGBlockObject.params.hasOwnProperty( key ) ) {
-				DFIGBlockObject.init( DFIGBlockObject.params[ key ] );
-			}
-		} );
-	}
-} )( wp );
diff --git a/includes/js/test-block.min.js b/includes/js/test-block.min.js
deleted file mode 100644
index 6d2f3dd..0000000
--- a/includes/js/test-block.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:i,setAttributes:s}=o,a=e.element.Fragment,c=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:i}),n.el(a,null,n.el(c,null,n.el(m,{value:i.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(r,{},function(t,o){const l=[],r=e.components.PanelBody;return Object.keys(o.panels).forEach(function(i,s){if(o.panels.hasOwnProperty(i)){const a=o.panels[i];l[s]=n.el(r,{title:a.title,initialOpen:a.initialOpen,className:"scriptless-panel-"+i},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageTestBlock?"":DisplayFeaturedImageTestBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index 5c30912..0bbcfee 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -138,7 +138,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		}
 		wp_register_script(
 			"{$this->block}block",
-			plugin_dir_url( dirname( __FILE__ ) ) . "js/test-block{$minify}.js",
+			plugin_dir_url( dirname( __FILE__ ) ) . "js/block{$minify}.js",
 			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
 			$version,
 			false
@@ -149,7 +149,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 * Localize.
 	 */
 	public function localize() {
-		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageTestBlock', $this->get_localization_data() );
+		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageBlock', $this->get_localization_data() );
 	}
 
 	/**

From 1aa3728e0d442957632c01b6dee8261ac95719ce Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 09:52:48 -0400
Subject: [PATCH 10/44] Move author widget defaults

---
 ...splayfeaturedimagegenesis-author-widget.php | 17 +----------------
 includes/widgets/fields/author-defaults.php    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 includes/widgets/fields/author-defaults.php

diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index a2198c7..eeec277 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -38,22 +38,7 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 	 * @return array
 	 */
 	public function defaults() {
-		return array(
-			'title'                    => '',
-			'show_featured_image'      => 0,
-			'featured_image_alignment' => 'alignnone',
-			'featured_image_size'      => 'medium',
-			'gravatar_alignment'       => 'left',
-			'user'                     => '',
-			'show_gravatar'            => 0,
-			'size'                     => 45,
-			'author_info'              => '',
-			'bio_text'                 => '',
-			'page'                     => '',
-			'page_link_text'           => __( 'Read More', 'display-featured-image-genesis' ) . '&#x02026;',
-			'posts_link'               => 0,
-			'link_text'                => __( 'View My Blog Posts', 'display-featured-image-genesis' ),
-		);
+		return include 'fields/author-defaults.php';
 	}
 
 	/**
diff --git a/includes/widgets/fields/author-defaults.php b/includes/widgets/fields/author-defaults.php
new file mode 100644
index 0000000..b49278a
--- /dev/null
+++ b/includes/widgets/fields/author-defaults.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+	'title'                    => '',
+	'show_featured_image'      => 0,
+	'featured_image_alignment' => 'alignnone',
+	'featured_image_size'      => 'medium',
+	'gravatar_alignment'       => 'left',
+	'user'                     => '',
+	'show_gravatar'            => 0,
+	'size'                     => 45,
+	'author_info'              => '',
+	'bio_text'                 => '',
+	'page'                     => '',
+	'page_link_text'           => __( 'Read More', 'display-featured-image-genesis' ) . '&#x02026;',
+	'posts_link'               => 0,
+	'link_text'                => __( 'View My Blog Posts', 'display-featured-image-genesis' ),
+);

From 97e3f84a1239e79b31d3772705d3a263bf232cf9 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 09:53:15 -0400
Subject: [PATCH 11/44] Add block editor styling

---
 includes/css/blocks.css                              |  1 +
 ...lass-displayfeaturedimagegenesis-output-block.php |  2 ++
 sass/blocks.scss                                     | 12 ++++++++++++
 3 files changed, 15 insertions(+)
 create mode 100644 includes/css/blocks.css
 create mode 100644 sass/blocks.scss

diff --git a/includes/css/blocks.css b/includes/css/blocks.css
new file mode 100644
index 0000000..d0b50e9
--- /dev/null
+++ b/includes/css/blocks.css
@@ -0,0 +1 @@
+div[class^="wp-block-displayfeaturedimagegenesis"]:before{position:absolute;top:0;right:0;bottom:0;left:0;content:' ';background-color:rgba(255,255,255,0)}
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index 0bbcfee..209516a 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -39,6 +39,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 				"{$this->name}{$block}",
 				array(
 					'editor_script'   => "{$this->block}block",
+					'editor_style'    => "{$this->block}block",
 					'attributes'      => $this->fields( $block ),
 					'render_callback' => array( $this, "render_{$data['nickname']}" ),
 				)
@@ -133,6 +134,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	public function register_script_style() {
 		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
 		$version = displayfeaturedimagegenesis_get()->version;
+		wp_register_style( "{$this->block}block", plugin_dir_url( dirname( __FILE__ ) ) . 'css/blocks.css', array(), $version, 'screen' );
 		if ( ! $minify ) {
 			$version .= current_time( 'gmt' );
 		}
diff --git a/sass/blocks.scss b/sass/blocks.scss
new file mode 100644
index 0000000..b4a9a36
--- /dev/null
+++ b/sass/blocks.scss
@@ -0,0 +1,12 @@
+div[class^="wp-block-displayfeaturedimagegenesis"] {
+	&:before {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		content: ' ';
+		background-color: rgba(255, 255, 255, 0);
+	}
+}
+

From ab86156af53faa1fc35eebb6001be3da94df95b3 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:12:46 -0400
Subject: [PATCH 12/44] Change how authors are retrieved for the author
 widget/block

---
 ...playfeaturedimagegenesis-author-widget.php | 31 +++++--------------
 includes/widgets/fields/author-user.php       | 18 +++++++++++
 2 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 includes/widgets/fields/author-user.php

diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index eeec277..10e353b 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -89,8 +89,15 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 	 */
 	public function get_fields( $new_instance ) {
 		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, $new_instance );
+		$user = array(
+			array(
+				'method' => 'select',
+				'args'   => include 'fields/author-user.php',
+			),
+		);
 
 		return array_merge(
+			array( $user ),
 			include 'fields/author-image.php',
 			include 'fields/author-gravatar.php',
 			include 'fields/author-description.php',
@@ -114,12 +121,7 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 			'label' => __( 'Title:', 'display-featured-image-genesis' ),
 			'class' => 'widefat',
 		) );
-		$form->do_select( $instance, array(
-			'id'      => 'user',
-			'label'   => __( 'Select a user. The email address for this account will be used to pull the Gravatar image.', 'display-featured-image-genesis' ),
-			'flex'    => true,
-			'choices' => $this->get_users(),
-		) );
+		$form->do_select( $instance, include 'fields/author-user.php' );
 
 		$form->do_boxes( array(
 			'author' => include 'fields/author-image.php',
@@ -138,23 +140,6 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 		) );
 	}
 
-	/**
-	 * Get the authors on the site.
-	 *
-	 * @return array
-	 */
-	protected function get_users() {
-		$users   = get_users( array(
-			'who' => 'authors',
-		) );
-		$options = array();
-		foreach ( $users as $user ) {
-			$options[ $user->ID ] = $user->data->display_name;
-		}
-
-		return $options;
-	}
-
 	/**
 	 * Get gravatar sizes.
 	 *
diff --git a/includes/widgets/fields/author-user.php b/includes/widgets/fields/author-user.php
new file mode 100644
index 0000000..38e49d8
--- /dev/null
+++ b/includes/widgets/fields/author-user.php
@@ -0,0 +1,18 @@
+<?php
+
+$users   = get_users(
+	array(
+		'who' => 'authors',
+	)
+);
+$options = array();
+foreach ( $users as $user ) {
+	$options[ $user->ID ] = $user->data->display_name;
+}
+
+return array(
+	'id'      => 'user',
+	'label'   => __( 'Select a user. The email address for this account will be used to pull the Gravatar image.', 'display-featured-image-genesis' ),
+	'flex'    => true,
+	'choices' => $options,
+);

From 0c36f0ce560e4dc65aba26e29e4c986c13c33eb6 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:35:05 -0400
Subject: [PATCH 13/44] Move page choices

---
 ...playfeaturedimagegenesis-author-widget.php | 21 -------------------
 includes/widgets/fields/author-archive.php    | 18 +++++++++++++++-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index 10e353b..3eee039 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -159,25 +159,4 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 
 		return $options;
 	}
-
-	/**
-	 * Get the pages on the site.
-	 *
-	 * @return array
-	 */
-	protected function get_pages() {
-		$page_ids = get_pages( array(
-			'post_type' => 'page',
-		) );
-		$pages    = array();
-		if ( $page_ids ) {
-			$pages[] = __( 'None', 'display-featured-image-genesis' );
-			foreach ( $page_ids as $id ) {
-				$title            = empty( $id->post_title ) ? '#' . $id->ID . __( ' (no title)', 'sixtenpress-featured-content' ) : $id->post_title;
-				$pages[ $id->ID ] = $title;
-			}
-		}
-
-		return $pages;
-	}
 }
diff --git a/includes/widgets/fields/author-archive.php b/includes/widgets/fields/author-archive.php
index cbdb793..fad3642 100644
--- a/includes/widgets/fields/author-archive.php
+++ b/includes/widgets/fields/author-archive.php
@@ -1,5 +1,21 @@
 <?php
 
+$page_ids     = get_pages(
+	array(
+		'post_type' => 'page',
+	)
+);
+$page_choices = array(
+	'' => __( 'None', 'display-featured-image-genesis' ),
+);
+if ( $page_ids ) {
+	foreach ( $page_ids as $page_id ) {
+		// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		$title                        = empty( $page_id->post_title ) ? '#' . $page_id->ID . __( ' (no title)', 'sixtenpress-featured-content' ) : $page_id->post_title;
+		$page_choices[ $page_id->ID ] = $title;
+	}
+}
+
 /**
  * Define author specific archive fields.
  */
@@ -9,7 +25,7 @@ return array(
 		'args'   => array(
 			'id'      => 'page',
 			'label'   => __( 'Choose your extended "About Me" page from the list below. This will be the page linked to at the end of the author description.', 'display-featured-image-genesis' ),
-			'choices' => $this->get_pages(),
+			'choices' => $page_choices,
 		),
 	),
 	array(

From 22a7bebaca9d9559efe8930e5fac881bab02e4df Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:36:55 -0400
Subject: [PATCH 14/44] Move gravatar sizes

---
 ...playfeaturedimagegenesis-author-widget.php | 20 ------------------
 includes/widgets/fields/author-gravatar.php   | 21 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index 3eee039..e6f3d40 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -139,24 +139,4 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 			'archive' => include 'fields/author-archive.php',
 		) );
 	}
-
-	/**
-	 * Get gravatar sizes.
-	 *
-	 * @return array
-	 */
-	protected function get_gravatar_sizes() {
-		$sizes   = apply_filters( 'genesis_gravatar_sizes', array(
-			__( 'Small', 'display-featured-image-genesis' )       => 45,
-			__( 'Medium', 'display-featured-image-genesis' )      => 65,
-			__( 'Large', 'display-featured-image-genesis' )       => 85,
-			__( 'Extra Large', 'display-featured-image-genesis' ) => 125,
-		) );
-		$options = array();
-		foreach ( (array) $sizes as $label => $size ) {
-			$options[ $size ] = $label;
-		}
-
-		return $options;
-	}
 }
diff --git a/includes/widgets/fields/author-gravatar.php b/includes/widgets/fields/author-gravatar.php
index f0bb075..c657244 100644
--- a/includes/widgets/fields/author-gravatar.php
+++ b/includes/widgets/fields/author-gravatar.php
@@ -1,5 +1,24 @@
 <?php
 
+/**
+ * Get gravatar sizes.
+ *
+ * @return array
+ */
+$sizes   = apply_filters(
+	'genesis_gravatar_sizes',
+	array(
+		__( 'Small', 'display-featured-image-genesis' )       => 45,
+		__( 'Medium', 'display-featured-image-genesis' )      => 65,
+		__( 'Large', 'display-featured-image-genesis' )       => 85,
+		__( 'Extra Large', 'display-featured-image-genesis' ) => 125,
+	)
+);
+$options = array();
+foreach ( (array) $sizes as $label => $size ) {
+	$options[ $size ] = $label;
+}
+
 /**
  * Define author specific gravatar fields.
  */
@@ -17,7 +36,7 @@ return array(
 			'id'      => 'size',
 			'label'   => __( 'Gravatar Size:', 'display-featured-image-genesis' ),
 			'flex'    => true,
-			'choices' => $this->get_gravatar_sizes(),
+			'choices' => $options,
 		),
 	),
 	array(

From 2c32e7360ab1e9af98d2c0bf72ebd099470fc0f2 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:45:34 -0400
Subject: [PATCH 15/44] Rename post type block

---
 ...isplayfeaturedimagegenesis-output-block.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index 209516a..dd80e80 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -54,7 +54,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 */
 	private function blocks() {
 		return array(
-			'term'      => array(
+			'term'   => array(
 				'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
 				'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
 				'keywords'    => array(
@@ -62,7 +62,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 					__( 'Featured Image', 'display-featured-image-genesis' ),
 				),
 			),
-			'author'    => array(
+			'author' => array(
 				'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
 				'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
 				'keywords'    => array(
@@ -70,7 +70,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 					__( 'Featured Image', 'display-featured-image-genesis' ),
 				),
 			),
-			'post-type' => array(
+			'cpt'    => array(
 				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
 				'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
 				'keywords'    => array(
@@ -96,9 +96,9 @@ class DisplayFeaturedImageGenesisOutputBlock {
 			return '';
 		}
 
-		$classes = $this->get_block_classes( $atts, 'post-type' );
+		$classes = $this->get_block_classes( $atts, 'cpt' );
 		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
-		$output = '<div class="' . implode( ' ', $classes ) . '">';
+		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
 		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
 		$output .= ob_get_contents();
@@ -208,10 +208,12 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		return $output;
 	}
 
+	/**
+	 * @param $block
+	 *
+	 * @return array
+	 */
 	private function get_all_fields( $block ) {
-		if ( 'post-type' === $block ) {
-			$block = 'cpt';
-		}
 		$fields     = "{$block}_fields";
 		$attributes = array_merge(
 			array(

From 22634c4d670c25458e0861b8e8c2f8e48906548a Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:46:23 -0400
Subject: [PATCH 16/44] Change how the block classes are defined

---
 .../widgets/class-displayfeaturedimagegenesis-output-block.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index dd80e80..a4fb366 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -125,7 +125,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 			$classes[] = 'align' . $atts['blockAlignment'];
 		}
 
-		return $classes;
+		return implode( ' ', $classes );
 	}
 
 	/**

From 52494bb0545e19c458b5f4e5c56728c58173fd88 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 10:46:38 -0400
Subject: [PATCH 17/44] Add the author profile block

---
 ...splayfeaturedimagegenesis-output-block.php | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
index a4fb366..5fae699 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
@@ -69,6 +69,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 					__( 'Author', 'display-featured-image-genesis' ),
 					__( 'Featured Image', 'display-featured-image-genesis' ),
 				),
+				'nickname'    => 'author',
 			),
 			'cpt'    => array(
 				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
@@ -109,10 +110,32 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	}
 
 	/**
-	 * Get the CSS classes for the block.
 	 * @param $atts
 	 *
-	 * @return array
+	 * @return string
+	 */
+	public function render_author( $atts ) {
+		$atts    = wp_parse_args( $atts, include 'fields/author-defaults.php' );
+		$classes = $this->get_block_classes( $atts, 'author' );
+		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
+
+		$output = '<div class="' . esc_attr( $classes ) . '">';
+		ob_start();
+		new DisplayFeaturedImageGenesisOutputAuthor( $atts, array() );
+		$output .= ob_get_contents();
+		ob_clean();
+		$output .= '</div>';
+
+		return $output;
+	}
+
+	/**
+	 * Get the CSS classes for the block.
+	 *
+	 * @param $atts
+	 * @param $block_id
+	 *
+	 * @return string
 	 */
 	private function get_block_classes( $atts, $block_id ) {
 		$classes = array(
@@ -202,7 +225,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 			if ( ! empty( $value['args']['id'] ) ) {
 				$key = $value['args']['id'];
 			}
-			$output[ $key ] = $this->get_individual_field_attributes( $value );
+			$output[ $key ] = $this->get_individual_field_attributes( $value, $block );
 		}
 
 		return $output;
@@ -240,6 +263,9 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		return $attributes;
 	}
 
+	/**
+	 * @return array
+	 */
 	protected function cpt_fields() {
 		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
 
@@ -251,20 +277,42 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		);
 	}
 
+	/**
+	 * @return array
+	 */
+	protected function author_fields() {
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		$user = array(
+			array(
+				'method' => 'select',
+				'args'   => include 'fields/author-user.php',
+			),
+		);
+
+		return array_merge(
+			$user,
+			include 'fields/author-image.php',
+			include 'fields/author-gravatar.php',
+			include 'fields/author-description.php',
+			include 'fields/author-archive.php'
+		);
+	}
+
 	/**
 	 * Get an array of attributes for an individual field.
 	 *
 	 * @param $field
+	 * @param $block
 	 *
 	 * @return array
 	 */
-	protected function get_individual_field_attributes( $field ) {
+	protected function get_individual_field_attributes( $field, $block ) {
 		$method     = empty( $field['method'] ) ? 'text' : $field['method'];
 		$field_type = $this->get_field_type( $method );
 		if ( empty( $field['args']['label'] ) ) {
 			return $field;
 		}
-		$defaults   = include 'fields/cpt-defaults.php';
+		$defaults   = include "fields/{$block}-defaults.php";
 		$attributes = array(
 			'type'    => $field_type,
 			'default' => $defaults[ $field['args']['id'] ],

From 1d964b7029745934ce2b5cc6ae985d5060a7edd9 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 11:15:32 -0400
Subject: [PATCH 18/44] Rename block class, separate output

---
 .../class-displayfeaturedimagegenesis.php     |   4 +-
 ...uredimagegenesis-widgets-blocks-output.php |  74 ++++++++++
 ...ayfeaturedimagegenesis-widgets-blocks.php} | 133 ++----------------
 includes/widgets/fields/blocks-attributes.php |  20 +++
 includes/widgets/fields/blocks.php            |  30 ++++
 5 files changed, 136 insertions(+), 125 deletions(-)
 create mode 100644 includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
 rename includes/widgets/{class-displayfeaturedimagegenesis-output-block.php => class-displayfeaturedimagegenesis-widgets-blocks.php} (58%)
 create mode 100644 includes/widgets/fields/blocks-attributes.php
 create mode 100644 includes/widgets/fields/blocks.php

diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index 7b48c19..6e39eb8 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -254,8 +254,8 @@ class Display_Featured_Image_Genesis {
 		if ( ! function_exists( 'register_block_type' ) ) {
 			return;
 		}
-		include_once 'widgets/class-displayfeaturedimagegenesis-output-block.php';
-		$block = new DisplayFeaturedImageGenesisOutputBlock();
+		include_once 'widgets/class-displayfeaturedimagegenesis-widgets-blocks.php';
+		$block = new DisplayFeaturedImageGenesisWidgetsBlocks();
 		$block->init();
 	}
 
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
new file mode 100644
index 0000000..71cace7
--- /dev/null
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -0,0 +1,74 @@
+<?php
+
+class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
+
+	private $block = 'displayfeaturedimagegenesis-';
+
+	/**
+	 * Render the widget in a container div.
+	 *
+	 * @param $atts
+	 *
+	 * @return string
+	 */
+	public function render_cpt( $atts ) {
+		$atts      = wp_parse_args( $atts, include 'fields/cpt-defaults.php' );
+		$post_type = get_post_type_object( $atts['post_type'] );
+		if ( ! $post_type ) {
+			return '';
+		}
+
+		$classes = $this->get_block_classes( $atts, 'cpt' );
+		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+		$output = '<div class="' . esc_attr( $classes ) . '">';
+		ob_start();
+		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
+		$output .= ob_get_contents();
+		ob_clean();
+		$output .= '</div>';
+
+		return $output;
+	}
+
+	/**
+	 * @param $atts
+	 *
+	 * @return string
+	 */
+	public function render_author( $atts ) {
+		$atts    = wp_parse_args( $atts, include 'fields/author-defaults.php' );
+		$classes = $this->get_block_classes( $atts, 'author' );
+		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
+
+		$output = '<div class="' . esc_attr( $classes ) . '">';
+		ob_start();
+		new DisplayFeaturedImageGenesisOutputAuthor( $atts, array() );
+		$output .= ob_get_contents();
+		ob_clean();
+		$output .= '</div>';
+
+		return $output;
+	}
+
+	/**
+	 * Get the CSS classes for the block.
+	 *
+	 * @param $atts
+	 * @param $block_id
+	 *
+	 * @return string
+	 */
+	private function get_block_classes( $atts, $block_id ) {
+		$classes = array(
+			"wp-block-{$this->block}{$block_id}",
+		);
+		if ( ! empty( $atts['className'] ) ) {
+			$classes[] = $atts['className'];
+		}
+		if ( ! empty( $atts['blockAlignment'] ) ) {
+			$classes[] = 'align' . $atts['blockAlignment'];
+		}
+
+		return implode( ' ', $classes );
+	}
+}
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
similarity index 58%
rename from includes/widgets/class-displayfeaturedimagegenesis-output-block.php
rename to includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index 5fae699..e2b0cee 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-output-block.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -1,12 +1,9 @@
 <?php
-/**
- * Copyright (c) 2019 Robin Cornett
- */
 
 /**
- * Class DisplayFeaturedImageGenesisOutputBlock
+ * Class DisplayFeaturedImageGenesisWidgetsBlocks
  */
-class DisplayFeaturedImageGenesisOutputBlock {
+class DisplayFeaturedImageGenesisWidgetsBlocks {
 
 	/**
 	 * The block name.
@@ -31,8 +28,10 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 */
 	public function init() {
 		$this->register_script_style();
+		include_once 'class-displayfeaturedimagegenesis-widgets-blocks-output.php';
+		$output = new DisplayFeaturedImageGenesisWidgetsBlocksOutput();
 		foreach ( $this->blocks() as $block => $data ) {
-			if ( empty( $data['nickname'] ) || ! is_callable( array( $this, "render_{$data['nickname']}" ) ) ) {
+			if ( empty( $data['nickname'] ) || ! is_callable( array( $output, "render_{$data['nickname']}" ) ) ) {
 				continue;
 			}
 			register_block_type(
@@ -41,7 +40,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 					'editor_script'   => "{$this->block}block",
 					'editor_style'    => "{$this->block}block",
 					'attributes'      => $this->fields( $block ),
-					'render_callback' => array( $this, "render_{$data['nickname']}" ),
+					'render_callback' => array( $output, "render_{$data['nickname']}" ),
 				)
 			);
 		}
@@ -53,109 +52,14 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	 * @return array
 	 */
 	private function blocks() {
-		return array(
-			'term'   => array(
-				'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Term', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-			),
-			'author' => array(
-				'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Author', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-				'nickname'    => 'author',
-			),
-			'cpt'    => array(
-				'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
-				'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
-				'keywords'    => array(
-					__( 'Post Type', 'display-featured-image-genesis' ),
-					__( 'Featured Image', 'display-featured-image-genesis' ),
-				),
-				'nickname'    => 'cpt',
-			),
-		);
-	}
-
-	/**
-	 * Render the widget in a container div.
-	 *
-	 * @param $atts
-	 *
-	 * @return string
-	 */
-	public function render_cpt( $atts ) {
-		$atts      = wp_parse_args( $atts, include 'fields/cpt-defaults.php' );
-		$post_type = get_post_type_object( $atts['post_type'] );
-		if ( ! $post_type ) {
-			return '';
-		}
-
-		$classes = $this->get_block_classes( $atts, 'cpt' );
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
-		$output = '<div class="' . esc_attr( $classes ) . '">';
-		ob_start();
-		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
-		$output .= ob_get_contents();
-		ob_clean();
-		$output .= '</div>';
-
-		return $output;
-	}
-
-	/**
-	 * @param $atts
-	 *
-	 * @return string
-	 */
-	public function render_author( $atts ) {
-		$atts    = wp_parse_args( $atts, include 'fields/author-defaults.php' );
-		$classes = $this->get_block_classes( $atts, 'author' );
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
-
-		$output = '<div class="' . esc_attr( $classes ) . '">';
-		ob_start();
-		new DisplayFeaturedImageGenesisOutputAuthor( $atts, array() );
-		$output .= ob_get_contents();
-		ob_clean();
-		$output .= '</div>';
-
-		return $output;
-	}
-
-	/**
-	 * Get the CSS classes for the block.
-	 *
-	 * @param $atts
-	 * @param $block_id
-	 *
-	 * @return string
-	 */
-	private function get_block_classes( $atts, $block_id ) {
-		$classes = array(
-			"wp-block-{$this->block}{$block_id}",
-		);
-		if ( ! empty( $atts['className'] ) ) {
-			$classes[] = $atts['className'];
-		}
-		if ( ! empty( $atts['blockAlignment'] ) ) {
-			$classes[] = 'align' . $atts['blockAlignment'];
-		}
-
-		return implode( ' ', $classes );
+		return include 'fields/blocks.php';
 	}
 
 	/**
 	 * Register the block script and style.
 	 */
 	public function register_script_style() {
-		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' . min';
+		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' .min';
 		$version = displayfeaturedimagegenesis_get()->version;
 		wp_register_style( "{$this->block}block", plugin_dir_url( dirname( __FILE__ ) ) . 'css/blocks.css', array(), $version, 'screen' );
 		if ( ! $minify ) {
@@ -189,7 +93,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 		);
 		$output = array();
 		foreach ( $blocks as $block => $data ) {
-			if ( empty( $data['nickname'] ) || ! is_callable( array( $this, "render_{$data['nickname']}" ) ) ) {
+			if ( empty( $data['nickname'] ) ) {
 				continue;
 			}
 			$common['panels'] = array(
@@ -239,24 +143,7 @@ class DisplayFeaturedImageGenesisOutputBlock {
 	private function get_all_fields( $block ) {
 		$fields     = "{$block}_fields";
 		$attributes = array_merge(
-			array(
-				'blockAlignment' => array(
-					'type'    => 'string',
-					'default' => '',
-				),
-				'className'      => array(
-					'type'    => 'string',
-					'default' => '',
-				),
-				'title'          => array(
-					'type'    => 'string',
-					'default' => '',
-					'args'    => array(
-						'id'    => 'title',
-						'label' => 'Title',
-					),
-				),
-			),
+			include 'fields/blocks-attributes.php',
 			$this->$fields()
 		);
 
diff --git a/includes/widgets/fields/blocks-attributes.php b/includes/widgets/fields/blocks-attributes.php
new file mode 100644
index 0000000..ae54c80
--- /dev/null
+++ b/includes/widgets/fields/blocks-attributes.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+	'blockAlignment' => array(
+		'type'    => 'string',
+		'default' => '',
+	),
+	'className'      => array(
+		'type'    => 'string',
+		'default' => '',
+	),
+	'title'          => array(
+		'type'    => 'string',
+		'default' => '',
+		'args'    => array(
+			'id'    => 'title',
+			'label' => __( 'Title', 'display-featured-image-genesis' ),
+		),
+	),
+);
diff --git a/includes/widgets/fields/blocks.php b/includes/widgets/fields/blocks.php
new file mode 100644
index 0000000..eee35db
--- /dev/null
+++ b/includes/widgets/fields/blocks.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+	'term'   => array(
+		'title'       => __( 'Display Featured Term Image', 'display-featured-image-genesis' ),
+		'description' => __( 'Display a featured term', 'display-featured-image-genesis' ),
+		'keywords'    => array(
+			__( 'Term', 'display-featured-image-genesis' ),
+			__( 'Featured Image', 'display-featured-image-genesis' ),
+		),
+	),
+	'author' => array(
+		'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
+		'description' => __( 'Display a featured author', 'display-featured-image-genesis' ),
+		'keywords'    => array(
+			__( 'Author', 'display-featured-image-genesis' ),
+			__( 'Featured Image', 'display-featured-image-genesis' ),
+		),
+		'nickname'    => 'author',
+	),
+	'cpt'    => array(
+		'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
+		'description' => __( 'Display a featured content type', 'display-featured-image-genesis' ),
+		'keywords'    => array(
+			__( 'Post Type', 'display-featured-image-genesis' ),
+			__( 'Featured Image', 'display-featured-image-genesis' ),
+		),
+		'nickname'    => 'cpt',
+	),
+);

From 74a8454002bc06719f56e6a9a22d6101afcbdaf6 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 11:29:33 -0400
Subject: [PATCH 19/44] Move field builder to separate class

---
 ...uredimagegenesis-widgets-blocks-fields.php | 142 ++++++++++++++++
 ...layfeaturedimagegenesis-widgets-blocks.php | 154 ++----------------
 2 files changed, 157 insertions(+), 139 deletions(-)
 create mode 100644 includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
new file mode 100644
index 0000000..2db5596
--- /dev/null
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -0,0 +1,142 @@
+<?php
+
+class DisplayFeaturedImageGenesisWidgetsBlocksFields {
+
+	/**
+	 * Get the fields for the block.
+	 *
+	 * @param $block
+	 *
+	 * @return array
+	 */
+	public function fields( $block ) {
+		$output = array();
+		foreach ( $this->get_all_fields( $block ) as $key => $value ) {
+			if ( ! empty( $value['args']['id'] ) ) {
+				$key = $value['args']['id'];
+			}
+			$output[ $key ] = $this->get_individual_field_attributes( $value, $block );
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @param $block
+	 *
+	 * @return array
+	 */
+	private function get_all_fields( $block ) {
+		$fields     = "{$block}_fields";
+		$attributes = array_merge(
+			include 'fields/blocks-attributes.php',
+			$this->$fields()
+		);
+
+		return $attributes;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function cpt_fields() {
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+
+		return array_merge(
+			include 'fields/cpt-post_type.php',
+			include 'fields/text.php',
+			include 'fields/image.php',
+			include 'fields/archive.php'
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function author_fields() {
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		$user = array(
+			array(
+				'method' => 'select',
+				'args'   => include 'fields/author-user.php',
+			),
+		);
+
+		return array_merge(
+			$user,
+			include 'fields/author-image.php',
+			include 'fields/author-gravatar.php',
+			include 'fields/author-description.php',
+			include 'fields/author-archive.php'
+		);
+	}
+
+	/**
+	 * Get an array of attributes for an individual field.
+	 *
+	 * @param $field
+	 * @param $block
+	 *
+	 * @return array
+	 */
+	private function get_individual_field_attributes( $field, $block ) {
+		$method     = empty( $field['method'] ) ? 'text' : $field['method'];
+		$field_type = $this->get_field_type( $method );
+		if ( empty( $field['args']['label'] ) ) {
+			return $field;
+		}
+		$defaults   = include "fields/{$block}-defaults.php";
+		$attributes = array(
+			'type'    => $field_type,
+			'default' => $defaults[ $field['args']['id'] ],
+			'label'   => $field['args']['label'],
+			'method'  => $method,
+		);
+		if ( in_array( 'number', array( $field_type, $method ), true ) ) {
+			$attributes['min'] = $field['args']['min'];
+			$attributes['max'] = $field['args']['max'];
+		} elseif ( 'select' === $method ) {
+			$attributes['options'] = $this->convert_choices_for_select( $field['args']['choices'] );
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Define the type of field for our script.
+	 *
+	 * @param $method
+	 *
+	 * @return string
+	 */
+	private function get_field_type( $method ) {
+		$type = 'string';
+		if ( 'number' === $method ) {
+			return $method;
+		}
+		if ( 'checkbox' === $method ) {
+			return 'boolean';
+		}
+
+		return $type;
+	}
+
+	/**
+	 * Convert a standard PHP array to what the block editor needs.
+	 *
+	 * @param $options
+	 *
+	 * @return array
+	 */
+	private function convert_choices_for_select( $options ) {
+		$output = array();
+		foreach ( $options as $value => $label ) {
+			$output[] = array(
+				'value' => $value,
+				'label' => $label,
+			);
+		}
+
+		return $output;
+	}
+}
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index e2b0cee..f2f3811 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -18,10 +18,9 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	protected $block = 'displayfeaturedimagegenesis-';
 
 	/**
-	 * The plugin setting.
-	 * @var array
+	 * @var \DisplayFeaturedImageGenesisWidgetsBlocksFields
 	 */
-	protected $setting;
+	private $fields;
 
 	/**
 	 * Register our block type.
@@ -30,6 +29,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 		$this->register_script_style();
 		include_once 'class-displayfeaturedimagegenesis-widgets-blocks-output.php';
 		$output = new DisplayFeaturedImageGenesisWidgetsBlocksOutput();
+		$fields = $this->get_fields_class();
 		foreach ( $this->blocks() as $block => $data ) {
 			if ( empty( $data['nickname'] ) || ! is_callable( array( $output, "render_{$data['nickname']}" ) ) ) {
 				continue;
@@ -39,7 +39,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 				array(
 					'editor_script'   => "{$this->block}block",
 					'editor_style'    => "{$this->block}block",
-					'attributes'      => $this->fields( $block ),
+					'attributes'      => $fields->fields( $block ),
 					'render_callback' => array( $output, "render_{$data['nickname']}" ),
 				)
 			);
@@ -86,13 +86,13 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	 * @return array
 	 */
 	protected function get_localization_data() {
-		$blocks = $this->blocks();
 		$common = array(
 			'icon'     => 'format-image',
 			'category' => 'widgets',
 		);
 		$output = array();
-		foreach ( $blocks as $block => $data ) {
+		$fields = $this->get_fields_class();
+		foreach ( $this->blocks() as $block => $data ) {
 			if ( empty( $data['nickname'] ) ) {
 				continue;
 			}
@@ -100,7 +100,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 				'main' => array(
 					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
 					'initialOpen' => true,
-					'attributes'  => $this->fields( $block ),
+					'attributes'  => $fields->fields( $block ),
 				),
 			);
 			$common['block']  = "{$this->name}{$block}";
@@ -117,140 +117,16 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	}
 
 	/**
-	 * Get the fields for the block.
-	 *
-	 * @param $block
-	 *
-	 * @return array
+	 * Get the fields class.
+	 * @return \DisplayFeaturedImageGenesisWidgetsBlocksFields
 	 */
-	private function fields( $block ) {
-		$output = array();
-		foreach ( $this->get_all_fields( $block ) as $key => $value ) {
-			if ( ! empty( $value['args']['id'] ) ) {
-				$key = $value['args']['id'];
-			}
-			$output[ $key ] = $this->get_individual_field_attributes( $value, $block );
+	private function get_fields_class() {
+		if ( isset( $this->fields ) ) {
+			return $this->fields;
 		}
+		include_once 'class-displayfeaturedimagegenesis-widgets-blocks-fields.php';
+		$this->fields = new DisplayFeaturedImageGenesisWidgetsBlocksFields();
 
-		return $output;
-	}
-
-	/**
-	 * @param $block
-	 *
-	 * @return array
-	 */
-	private function get_all_fields( $block ) {
-		$fields     = "{$block}_fields";
-		$attributes = array_merge(
-			include 'fields/blocks-attributes.php',
-			$this->$fields()
-		);
-
-		return $attributes;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function cpt_fields() {
-		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
-
-		return array_merge(
-			include 'fields/cpt-post_type.php',
-			include 'fields/text.php',
-			include 'fields/image.php',
-			include 'fields/archive.php'
-		);
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function author_fields() {
-		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
-		$user = array(
-			array(
-				'method' => 'select',
-				'args'   => include 'fields/author-user.php',
-			),
-		);
-
-		return array_merge(
-			$user,
-			include 'fields/author-image.php',
-			include 'fields/author-gravatar.php',
-			include 'fields/author-description.php',
-			include 'fields/author-archive.php'
-		);
-	}
-
-	/**
-	 * Get an array of attributes for an individual field.
-	 *
-	 * @param $field
-	 * @param $block
-	 *
-	 * @return array
-	 */
-	protected function get_individual_field_attributes( $field, $block ) {
-		$method     = empty( $field['method'] ) ? 'text' : $field['method'];
-		$field_type = $this->get_field_type( $method );
-		if ( empty( $field['args']['label'] ) ) {
-			return $field;
-		}
-		$defaults   = include "fields/{$block}-defaults.php";
-		$attributes = array(
-			'type'    => $field_type,
-			'default' => $defaults[ $field['args']['id'] ],
-			'label'   => $field['args']['label'],
-			'method'  => $method,
-		);
-		if ( in_array( 'number', array( $field_type, $method ), true ) ) {
-			$attributes['min'] = $field['args']['min'];
-			$attributes['max'] = $field['args']['max'];
-		} elseif ( 'select' === $method ) {
-			$attributes['options'] = $this->convert_choices_for_select( $field['args']['choices'] );
-		}
-
-		return $attributes;
-	}
-
-	/**
-	 * Define the type of field for our script.
-	 *
-	 * @param $method
-	 *
-	 * @return string
-	 */
-	private function get_field_type( $method ) {
-		$type = 'string';
-		if ( 'number' === $method ) {
-			return $method;
-		}
-		if ( 'checkbox' === $method ) {
-			return 'boolean';
-		}
-
-		return $type;
-	}
-
-	/**
-	 * Convert a standard PHP array to what the block editor needs.
-	 *
-	 * @param $options
-	 *
-	 * @return array
-	 */
-	private function convert_choices_for_select( $options ) {
-		$output = array();
-		foreach ( $options as $value => $label ) {
-			$output[] = array(
-				'value' => $value,
-				'label' => $label,
-			);
-		}
-
-		return $output;
+		return $this->fields;
 	}
 }

From 6d8dc47d629d90716fba044dc058ca21031b8055 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 11:48:06 -0400
Subject: [PATCH 20/44] Move term widget defaults

---
 ...isplayfeaturedimagegenesis-taxonomy-widget.php | 14 +-------------
 includes/widgets/fields/term-defaults.php         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 includes/widgets/fields/term-defaults.php

diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index cb60825..6fc64ec 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -47,19 +47,7 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 	 * @return array
 	 */
 	public function defaults() {
-		return array(
-			'title'             => '',
-			'taxonomy'          => 'category',
-			'term'              => '',
-			'show_image'        => 0,
-			'image_alignment'   => '',
-			'image_size'        => 'medium',
-			'show_title'        => 0,
-			'show_content'      => 0,
-			'custom_content'    => '',
-			'archive_link'      => 0,
-			'archive_link_text' => __( 'View Term Archive', 'display-featured-image-genesis' ),
-		);
+		return include 'fields/term-defaults.php';
 	}
 
 	/**
diff --git a/includes/widgets/fields/term-defaults.php b/includes/widgets/fields/term-defaults.php
new file mode 100644
index 0000000..4a6ce0a
--- /dev/null
+++ b/includes/widgets/fields/term-defaults.php
@@ -0,0 +1,15 @@
+<?php
+
+return array(
+	'title'             => '',
+	'taxonomy'          => 'category',
+	'term'              => '',
+	'show_image'        => 0,
+	'image_alignment'   => '',
+	'image_size'        => 'medium',
+	'show_title'        => 0,
+	'show_content'      => 0,
+	'custom_content'    => '',
+	'archive_link'      => 0,
+	'archive_link_text' => __( 'View Term Archive', 'display-featured-image-genesis' ),
+);

From 07610a7ffd8fecf00ae18d438cf4c1465b5fa9e4 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 11:48:37 -0400
Subject: [PATCH 21/44] Fix includes

---
 ...lass-displayfeaturedimagegenesis-widgets-blocks-output.php | 4 ++--
 .../widgets/displayfeaturedimagegenesis-author-widget.php     | 2 +-
 .../displayfeaturedimagegenesis-cpt-archive-widget.php        | 2 +-
 .../widgets/displayfeaturedimagegenesis-taxonomy-widget.php   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index 71cace7..aed5a94 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -19,7 +19,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 		}
 
 		$classes = $this->get_block_classes( $atts, 'cpt' );
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
 		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
 		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
@@ -38,7 +38,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	public function render_author( $atts ) {
 		$atts    = wp_parse_args( $atts, include 'fields/author-defaults.php' );
 		$classes = $this->get_block_classes( $atts, 'author' );
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
 
 		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index e6f3d40..31408ff 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -54,7 +54,7 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 
 		echo $args['before_widget'];
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
 		new DisplayFeaturedImageGenesisOutputAuthor( $instance, $args, $this->id_base );
 
 		echo $args['after_widget'];
diff --git a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
index 7baab40..22b06eb 100644
--- a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
@@ -70,7 +70,7 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 
 		echo $args['before_widget'];
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
 		new DisplayFeaturedImageGenesisOutputCPT( $instance, $args, $post_type, $this->id_base );
 
 		echo $args['after_widget'];
diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index 6fc64ec..8e4c3ee 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -70,7 +70,7 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 		$args['before_widget'] = str_replace( 'class="widget ', 'class="widget ' . $term->slug . ' ', $args['before_widget'] );
 		echo $args['before_widget'];
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-term.php';
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-term.php';
 		new DisplayFeaturedImageGenesisOutputTerm( $instance, $args, $term, $this->id_base );
 
 		echo $args['after_widget'];

From 4f4ff670e66aebcc78c1d9500f9115c21f1efe37 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 12:05:14 -0400
Subject: [PATCH 22/44] Move localization function

---
 ...uredimagegenesis-widgets-blocks-fields.php | 40 +++++++++++++++++++
 ...layfeaturedimagegenesis-widgets-blocks.php | 36 +----------------
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index 2db5596..be7130b 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -1,7 +1,47 @@
 <?php
 
+/**
+ * Class DisplayFeaturedImageGenesisWidgetsBlocksFields
+ */
 class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 
+	/**
+	 * @var \DisplayFeaturedImageGenesisWidgetsForm
+	 */
+	private $form;
+
+	/**
+	 * Get the data for localizing everything.
+	 * @return array
+	 */
+	public function get_localization_data() {
+		$common = array(
+			'icon'     => 'format-image',
+			'category' => 'widgets',
+		);
+		$output = array();
+		$blocks = include 'fields/blocks.php';
+		foreach ( $blocks as $block => $data ) {
+			if ( empty( $data['nickname'] ) ) {
+				continue;
+			}
+			$common['panels'] = array(
+				'main' => array(
+					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
+					'initialOpen' => true,
+					'attributes'  => $this->fields( $block ),
+				),
+			);
+			$common['block']  = "displayfeaturedimagegenesis/{$block}";
+			$output[ $block ] = array_merge(
+				$data,
+				$common
+			);
+		}
+
+		return $output;
+	}
+
 	/**
 	 * Get the fields for the block.
 	 *
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index f2f3811..4eeeb22 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -78,42 +78,8 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	 * Localize.
 	 */
 	public function localize() {
-		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageBlock', $this->get_localization_data() );
-	}
-
-	/**
-	 * Get the data for localizing everything.
-	 * @return array
-	 */
-	protected function get_localization_data() {
-		$common = array(
-			'icon'     => 'format-image',
-			'category' => 'widgets',
-		);
-		$output = array();
 		$fields = $this->get_fields_class();
-		foreach ( $this->blocks() as $block => $data ) {
-			if ( empty( $data['nickname'] ) ) {
-				continue;
-			}
-			$common['panels'] = array(
-				'main' => array(
-					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
-					'initialOpen' => true,
-					'attributes'  => $fields->fields( $block ),
-				),
-			);
-			$common['block']  = "{$this->name}{$block}";
-			if ( ! empty( $data['nickname'] ) ) {
-				$block = $data['nickname'];
-			}
-			$output[ $block ] = array_merge(
-				$data,
-				$common
-			);
-		}
-
-		return $output;
+		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageBlock', $fields->get_localization_data() );
 	}
 
 	/**

From 10cba769c16f84b422df5c07e043d1db2b2ddefe Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 12:05:38 -0400
Subject: [PATCH 23/44] Add a getter for the widget form class

---
 ...turedimagegenesis-widgets-blocks-fields.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index be7130b..d92546f 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -80,7 +80,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 	 * @return array
 	 */
 	protected function cpt_fields() {
-		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		$form = $this->get_form_class();
 
 		return array_merge(
 			include 'fields/cpt-post_type.php',
@@ -94,7 +94,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 	 * @return array
 	 */
 	protected function author_fields() {
-		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		$form = $this->get_form_class();
 		$user = array(
 			array(
 				'method' => 'select',
@@ -179,4 +179,18 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 
 		return $output;
 	}
+
+	/**
+	 * Get the widget builder form class.
+	 *
+	 * @return \DisplayFeaturedImageGenesisWidgetsForm
+	 */
+	private function get_form_class() {
+		if ( isset( $this->form ) ) {
+			return $this->form;
+		}
+		$this->form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+
+		return $this->form;
+	}
 }

From b3307b8f32bd55240cde19b11e4be0af8e476628 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Mon, 24 Jun 2019 12:06:05 -0400
Subject: [PATCH 24/44] Update block editor style

---
 includes/css/blocks.css | 2 +-
 sass/blocks.scss        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/css/blocks.css b/includes/css/blocks.css
index d0b50e9..4874a29 100644
--- a/includes/css/blocks.css
+++ b/includes/css/blocks.css
@@ -1 +1 @@
-div[class^="wp-block-displayfeaturedimagegenesis"]:before{position:absolute;top:0;right:0;bottom:0;left:0;content:' ';background-color:rgba(255,255,255,0)}
\ No newline at end of file
+div[class^="wp-block-displayfeaturedimagegenesis"]{overflow:auto}div[class^="wp-block-displayfeaturedimagegenesis"]:before{position:absolute;top:0;right:0;bottom:0;left:0;content:' ';background-color:rgba(255,255,255,0)}
\ No newline at end of file
diff --git a/sass/blocks.scss b/sass/blocks.scss
index b4a9a36..73291db 100644
--- a/sass/blocks.scss
+++ b/sass/blocks.scss
@@ -1,4 +1,6 @@
 div[class^="wp-block-displayfeaturedimagegenesis"] {
+	overflow: auto;
+
 	&:before {
 		position: absolute;
 		top: 0;

From bb4a18b320dc88d34e0a3d909e72f85cf0dbe788 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:34:28 -0400
Subject: [PATCH 25/44] Update taxonomy list

---
 ...playfeaturedimagegenesis-taxonomy-widget.php | 17 -----------------
 includes/widgets/fields/term-taxonomy.php       | 11 ++++++++++-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index 8e4c3ee..c17ec38 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -154,23 +154,6 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 		) );
 	}
 
-	/**
-	 * @return array
-	 */
-	protected function get_taxonomies() {
-		$args       = array(
-			'public'  => true,
-			'show_ui' => true,
-		);
-		$taxonomies = get_taxonomies( $args, 'objects' );
-		$options    = array();
-		foreach ( $taxonomies as $taxonomy ) {
-			$options[ $taxonomy->name ] = $taxonomy->label;
-		}
-
-		return $options;
-	}
-
 	/**
 	 * @param $instance
 	 * @param bool $ajax
diff --git a/includes/widgets/fields/term-taxonomy.php b/includes/widgets/fields/term-taxonomy.php
index 0c918f8..c06ad1e 100644
--- a/includes/widgets/fields/term-taxonomy.php
+++ b/includes/widgets/fields/term-taxonomy.php
@@ -1,5 +1,14 @@
 <?php
 
+$args        = array(
+	'public'  => true,
+	'show_ui' => true,
+);
+$taxonomies  = get_taxonomies( $args, 'objects' );
+$tax_options = array();
+foreach ( $taxonomies as $taxonomy ) {
+	$tax_options[ $taxonomy->name ] = $taxonomy->label;
+}
 /**
  * Define term specific taxonomy fields.
  */
@@ -11,7 +20,7 @@ return array(
 			'label'    => __( 'Taxonomy:', 'display-featured-image-genesis' ),
 			'flex'     => true,
 			'onchange' => sprintf( 'term_postback(\'%s\', this.value );', esc_attr( $this->get_field_id( 'term' ) ) ),
-			'choices'  => $this->get_taxonomies(),
+			'choices'  => $tax_options,
 		),
 	),
 	array(

From 515c51ebfe0ff646045bd339c84eb584f739021c Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:35:07 -0400
Subject: [PATCH 26/44] Make sure the instance is set for the term lists

---
 includes/widgets/fields/term-taxonomy.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/includes/widgets/fields/term-taxonomy.php b/includes/widgets/fields/term-taxonomy.php
index c06ad1e..e6d8df8 100644
--- a/includes/widgets/fields/term-taxonomy.php
+++ b/includes/widgets/fields/term-taxonomy.php
@@ -9,6 +9,10 @@ $tax_options = array();
 foreach ( $taxonomies as $taxonomy ) {
 	$tax_options[ $taxonomy->name ] = $taxonomy->label;
 }
+if ( empty( $instance ) ) {
+	$instance = include 'term-defaults.php';
+}
+
 /**
  * Define term specific taxonomy fields.
  */

From ff3fe360da6e4d2721317ea898c40a5329cb7c34 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:35:43 -0400
Subject: [PATCH 27/44] Move the ajax callback

---
 ...splayfeaturedimagegenesis-widgets-form.php | 38 +++++++++++++++++
 ...ayfeaturedimagegenesis-taxonomy-widget.php | 41 +------------------
 includes/widgets/fields/term-taxonomy.php     |  2 +-
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
index 5eb6898..69eb132 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
@@ -73,6 +73,44 @@ class DisplayFeaturedImageGenesisWidgetsForm {
 		);
 	}
 
+	/**
+	 * @param $instance
+	 * @param bool $ajax
+	 *
+	 * @return mixed
+	 */
+	public function get_term_lists( $instance, $ajax = false ) {
+		$args        = array(
+			'orderby'    => 'name',
+			'order'      => 'ASC',
+			'hide_empty' => false,
+		);
+		$taxonomy    = $ajax ? filter_input( INPUT_POST, 'taxonomy', FILTER_SANITIZE_STRING ) : $instance['taxonomy'];
+		$terms       = get_terms( $taxonomy, $args );
+		$options[''] = '--';
+		foreach ( $terms as $term ) {
+			if ( is_object( $term ) ) {
+				$options[ $term->term_id ] = $term->name;
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Handles the callback to populate the custom term dropdown. The
+	 * selected post type is provided in $_POST['taxonomy'], and the
+	 * calling script expects a JSON array of term objects.
+	 */
+	public function term_action_callback() {
+
+		$list = $this->get_term_lists( array(), true );
+
+		// And emit it
+		echo wp_json_encode( $list );
+		die();
+	}
+
 	/**
 	 * Build boxes with fields.
 	 *
diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index c17ec38..9a7d7b9 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -39,7 +39,8 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 
 		parent::__construct( 'featured-taxonomy', __( 'Display Featured Term Image', 'display-featured-image-genesis' ), $widget_ops, $control_ops );
 
-		add_action( 'wp_ajax_widget_selector', array( $this, 'term_action_callback' ) );
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, array() );
+		add_action( 'wp_ajax_widget_selector', array( $form, 'term_action_callback' ) );
 
 	}
 
@@ -153,42 +154,4 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 			'archive' => include 'fields/archive.php',
 		) );
 	}
-
-	/**
-	 * @param $instance
-	 * @param bool $ajax
-	 *
-	 * @return mixed
-	 */
-	protected function get_term_lists( $instance, $ajax = false ) {
-		$args        = array(
-			'orderby'    => 'name',
-			'order'      => 'ASC',
-			'hide_empty' => false,
-		);
-		$taxonomy    = $ajax ? filter_input( INPUT_POST, 'taxonomy', FILTER_SANITIZE_STRING ) : $instance['taxonomy'];
-		$terms       = get_terms( $taxonomy, $args );
-		$options[''] = '--';
-		foreach ( $terms as $term ) {
-			if ( is_object( $term ) ) {
-				$options[ $term->term_id ] = $term->name;
-			}
-		}
-
-		return $options;
-	}
-
-	/**
-	 * Handles the callback to populate the custom term dropdown. The
-	 * selected post type is provided in $_POST['taxonomy'], and the
-	 * calling script expects a JSON array of term objects.
-	 */
-	public function term_action_callback() {
-
-		$list = $this->get_term_lists( array(), true );
-
-		// And emit it
-		echo wp_json_encode( $list );
-		die();
-	}
 }
diff --git a/includes/widgets/fields/term-taxonomy.php b/includes/widgets/fields/term-taxonomy.php
index e6d8df8..e8b438d 100644
--- a/includes/widgets/fields/term-taxonomy.php
+++ b/includes/widgets/fields/term-taxonomy.php
@@ -33,7 +33,7 @@ return array(
 			'id'      => 'term',
 			'label'   => __( 'Term:', 'display-featured-image-genesis' ),
 			'flex'    => true,
-			'choices' => $this->get_term_lists( $instance, false ),
+			'choices' => $form->get_term_lists( $instance, false ),
 		),
 	),
 );

From c54d7f78eefe4d53e8b6df6cacbf4a4026928b9c Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:35:58 -0400
Subject: [PATCH 28/44] Fix onchange value outside of widgets screen

---
 includes/widgets/fields/term-taxonomy.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/widgets/fields/term-taxonomy.php b/includes/widgets/fields/term-taxonomy.php
index e8b438d..5f835bc 100644
--- a/includes/widgets/fields/term-taxonomy.php
+++ b/includes/widgets/fields/term-taxonomy.php
@@ -13,6 +13,8 @@ if ( empty( $instance ) ) {
 	$instance = include 'term-defaults.php';
 }
 
+$onchange = is_callable( $this, 'get_field_id ' ) ? sprintf( 'term_postback(\'%s\', this.value );', esc_attr( $this->get_field_id( 'term' ) ) ) : '';
+
 /**
  * Define term specific taxonomy fields.
  */
@@ -23,7 +25,7 @@ return array(
 			'id'       => 'taxonomy',
 			'label'    => __( 'Taxonomy:', 'display-featured-image-genesis' ),
 			'flex'     => true,
-			'onchange' => sprintf( 'term_postback(\'%s\', this.value );', esc_attr( $this->get_field_id( 'term' ) ) ),
+			'onchange' => '',
 			'choices'  => $tax_options,
 		),
 	),

From 44fd9754dc1aa9f157f2d1f8019b62a679f1284a Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:36:34 -0400
Subject: [PATCH 29/44] Add term block placeholder styling

---
 includes/css/blocks.css | 2 +-
 sass/blocks.scss        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/css/blocks.css b/includes/css/blocks.css
index 4874a29..cf0ecd7 100644
--- a/includes/css/blocks.css
+++ b/includes/css/blocks.css
@@ -1 +1 @@
-div[class^="wp-block-displayfeaturedimagegenesis"]{overflow:auto}div[class^="wp-block-displayfeaturedimagegenesis"]:before{position:absolute;top:0;right:0;bottom:0;left:0;content:' ';background-color:rgba(255,255,255,0)}
\ No newline at end of file
+div[class^="wp-block-displayfeaturedimagegenesis"]{overflow:auto}div[class^="wp-block-displayfeaturedimagegenesis"]:before{position:absolute;top:0;right:0;bottom:0;left:0;content:' ';background-color:rgba(255,255,255,0)}.displayfeaturedimagegenesis-placeholder{text-align:center;background:#eee;color:#111;padding:18px}
\ No newline at end of file
diff --git a/sass/blocks.scss b/sass/blocks.scss
index 73291db..685aa86 100644
--- a/sass/blocks.scss
+++ b/sass/blocks.scss
@@ -12,3 +12,10 @@ div[class^="wp-block-displayfeaturedimagegenesis"] {
 	}
 }
 
+.displayfeaturedimagegenesis-placeholder {
+	text-align: center;
+	background: #eee;
+	color: #111;
+	padding: 18px;
+}
+

From d6bbd8a782c766e8a74d35ab481ba07a4adcf757 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:37:40 -0400
Subject: [PATCH 30/44] Add the featured term block

---
 includes/js/block.js                          | 113 +++++++++++++++++-
 includes/js/block.min.js                      |   2 +-
 ...uredimagegenesis-widgets-blocks-fields.php |  27 ++++-
 ...uredimagegenesis-widgets-blocks-output.php |  33 +++++
 ...layfeaturedimagegenesis-widgets-blocks.php |   1 +
 includes/widgets/fields/blocks.php            |   1 +
 6 files changed, 169 insertions(+), 8 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index f6a8ea4..aad9232 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -55,7 +55,8 @@
 						),
 					),
 					DFIGBlockObject.el( InspectorControls, {},
-						_getPanels( props, params )
+						_getPanels( props, params, params.block ),
+						onChangeSelect( false, false, props )
 					)
 				];
 			},
@@ -71,10 +72,11 @@
 	 *
 	 * @param props
 	 * @param params
+	 * @param blockName
 	 * @return {Array}
 	 * @private
 	 */
-	function _getPanels( props, params ) {
+	function _getPanels( props, params, blockName ) {
 		const panels    = [],
 		      PanelBody = wp.components.PanelBody;
 		Object.keys( params.panels ).forEach( function ( key, index ) {
@@ -84,7 +86,7 @@
 					title: IndividualPanel.title,
 					initialOpen: IndividualPanel.initialOpen,
 					className: 'scriptless-panel-' + key
-				}, _getControls( props, IndividualPanel.attributes ) );
+				}, _getControls( props, IndividualPanel.attributes, blockName ) );
 			}
 		} );
 
@@ -96,10 +98,11 @@
 	 *
 	 * @param props
 	 * @param fields
+	 * @param blockName
 	 * @return {Array}
 	 * @private
 	 */
-	function _getControls( props, fields ) {
+	function _getControls( props, fields, blockName ) {
 		const controls = [];
 		Object.keys( fields ).forEach( function ( key, index ) {
 			if ( fields.hasOwnProperty( key ) ) {
@@ -109,7 +112,7 @@
 				}
 				const IndividualField = fields[key],
 				      control         = _getControlType( IndividualField.method, IndividualField.type );
-				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
+				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props, blockName ) );
 			}
 		} );
 
@@ -152,16 +155,18 @@
 	 * @param key
 	 * @param field
 	 * @param props
+	 * @param blockName
 	 * @return {{label: *, value: *, className: string, onChange: onChange}}
 	 * @private
 	 */
-	function _getIndividualControl( key, field, props ) {
+	function _getIndividualControl( key, field, props, blockName ) {
 		const {attributes, setAttributes} = props;
 		const control = {
 			label: field.label,
 			value: attributes[key],
 			className: 'displayfeaturedimagegenesis-' + key,
 			onChange: ( value ) => {
+				onChangeSelect( key, value, props, blockName );
 				setAttributes( {[key]: value} );
 			}
 		};
@@ -183,6 +188,102 @@
 		return control;
 	}
 
+	/**
+	 * Update values and options.
+	 * @param select_id
+	 * @param value
+	 * @param props
+	 * @param blockName
+	 */
+	function onChangeSelect( select_id, value, props, blockName ) {
+		if ( 'displayfeaturedimagegenesis/term' !== blockName ) {
+			return;
+		}
+		const data = _getAjaxData( select_id, value, props );
+		_doAjaxUpdate( data, select_id, props );
+	}
+
+	/**
+	 *
+	 * @param select_id
+	 * @param value
+	 * @param props
+	 * @returns {{action: string, security: *}}
+	 * @private
+	 */
+	function _getAjaxData( select_id, value, props ) {
+		const data         = {
+			      action: 'displayfeaturedimagegenesis_block',
+			      security: DFIGBlockObject.params.security
+		      },
+		      {attributes} = props;
+		if ( 'taxonomy' === select_id ) {
+			data.taxonomy = value;
+		} else {
+			data.taxonomy = attributes.taxonomy;
+		}
+
+		return data;
+	}
+
+	/**
+	 * Call on our ajax action and update the select
+	 * @param data
+	 * @param select_id
+	 * @param props
+	 * @return
+	 * @private
+	 */
+	function _doAjaxUpdate( data, select_id, props ) {
+		const {attributes, setAttributes} = props;
+		$.post( DFIGBlockObject.params.ajax_url, data, function ( response ) {
+
+			if ( undefined !== response.success && false === response.success ) {
+				return false;
+			}
+
+			const jsonData = $.parseJSON( response );
+
+			_modifySelectInput( jsonData, 'term', attributes );
+			if ( select_id ) {
+				setAttributes( {
+					term: '',
+				} );
+			}
+		} );
+	}
+
+	/**
+	 * Modify the term dropdown.
+	 * @param options
+	 * @param key
+	 * @param attributes
+	 * @private
+	 */
+	function _modifySelectInput( options, key, attributes ) {
+		const selectID = $( '.displayfeaturedimagegenesis-' + key + ' select' ),
+		      oldValue = attributes[key] || '';
+		selectID.empty();
+		_updateSelectOptions( options, selectID, oldValue );
+	}
+
+	/**
+	 * Update the select input with the new options.
+	 * @param options
+	 * @param selectID
+	 * @param oldValue
+	 * @private
+	 */
+	function _updateSelectOptions( options, selectID, oldValue ) {
+		$.each( options, function ( key, value ) {
+			const new_option = $( '<option />' )
+				      .val( key ).text( value ),
+			      method     = ! key ? 'prepend' : 'append';
+			selectID.val( oldValue );
+			selectID[method]( new_option );
+		} );
+	}
+
 	DFIGBlockObject.params = typeof DisplayFeaturedImageBlock === 'undefined' ? '' : DisplayFeaturedImageBlock;
 
 	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index cc89cca..3029875 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};n.init=function(t){const o=e.blocks.registerBlockType,l=e.components.ServerSideRender,r=e.editor.InspectorControls;o(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:o=>{const{attributes:i,setAttributes:s}=o,a=e.element.Fragment,c=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(l,{block:t.block,attributes:i}),n.el(a,null,n.el(c,null,n.el(m,{value:i.blockAlignment,controls:["wide","full"],onChange:e=>{s({blockAlignment:e})}}))),n.el(r,{},function(t,o){const l=[],r=e.components.PanelBody;return Object.keys(o.panels).forEach(function(i,s){if(o.panels.hasOwnProperty(i)){const a=o.panels[i];l[s]=n.el(r,{title:a.title,initialOpen:a.initialOpen,className:"scriptless-panel-"+i},function(t,o){const l=[];return Object.keys(o).forEach(function(r,i){if(o.hasOwnProperty(r)){if(-1!==["blockAlignment","className"].indexOf(r))return;const s=o[r],a=function(t,n){const{TextControl:o,SelectControl:l,RangeControl:r,CheckboxControl:i,TextareaControl:s}=e.components,a=o;return"select"===t?l:"number"===t&&"number"===n?r:"checkbox"===t?i:"textarea"===t?s:a}(s.method,s.type);l[i]=n.el(a,function(e,t,n){const{attributes:o,setAttributes:l}=n,r={label:t.label,value:o[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{l({[e]:t})}};return"select"===t.method?r.options=t.options:"number"===t.method?(r.min=t.min,r.max=t.max,"number"!==t.type?r.type="number":r.initialPosition=t.min):"checkbox"===t.method&&(r.checked=o[e]),r}(r,s,t))}}),l}(t,a.attributes))}}),l}(o,t))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"displayfeaturedimagegenesis/term"===s&&"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index d92546f..8ea33b8 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -19,7 +19,10 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 			'icon'     => 'format-image',
 			'category' => 'widgets',
 		);
-		$output = array();
+		$output = array(
+			'ajax_url' => admin_url( 'admin-ajax.php' ),
+			'security' => wp_create_nonce( 'displayfeaturedimagegenesis-block-nonce' ),
+		);
 		$blocks = include 'fields/blocks.php';
 		foreach ( $blocks as $block => $data ) {
 			if ( empty( $data['nickname'] ) ) {
@@ -61,6 +64,14 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 		return $output;
 	}
 
+	/**
+	 * Set the block term action callback here since this class already has a getter for the form class.
+	 */
+	public function term_action_callback() {
+		$form = $this->get_form_class();
+		$form->term_action_callback();
+	}
+
 	/**
 	 * @param $block
 	 *
@@ -111,6 +122,20 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 		);
 	}
 
+	/**
+	 * @return array
+	 */
+	protected function term_fields() {
+		$form = $this->get_form_class();
+
+		return array_merge(
+			include 'fields/text.php',
+			include 'fields/term-taxonomy.php',
+			include 'fields/image.php',
+			include 'fields/archive.php'
+		);
+	}
+
 	/**
 	 * Get an array of attributes for an individual field.
 	 *
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index aed5a94..a1bef1f 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -1,7 +1,13 @@
 <?php
 
+/**
+ * Class DisplayFeaturedImageGenesisWidgetsBlocksOutput
+ */
 class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 
+	/**
+	 * @var string
+	 */
 	private $block = 'displayfeaturedimagegenesis-';
 
 	/**
@@ -50,6 +56,33 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 		return $output;
 	}
 
+	/**
+	 * @param $atts
+	 *
+	 * @return string
+	 */
+	public function render_term( $atts ) {
+		if ( empty( $atts['term'] ) ) {
+			return '<div class="displayfeaturedimagegenesis-placeholder">' . __( 'Please select a term.', 'sixtenpress' ) . '</div>';
+		}
+		$atts = wp_parse_args( $atts, include 'fields/term-defaults.php' );
+		$term = get_term_by( 'id', $atts['term'], $atts['taxonomy'] );
+		if ( ! $term ) {
+			return '';
+		}
+		$classes = $this->get_block_classes( $atts, 'term' );
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-term.php';
+
+		$output = '<div class="' . esc_attr( $classes ) . '">';
+		ob_start();
+		new DisplayFeaturedImageGenesisOutputTerm( $atts, array(), $term );
+		$output .= ob_get_contents();
+		ob_clean();
+		$output .= '</div>';
+
+		return $output;
+	}
+
 	/**
 	 * Get the CSS classes for the block.
 	 *
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index 4eeeb22..a6c0fc2 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -45,6 +45,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 			);
 		}
 		add_action( 'enqueue_block_editor_assets', array( $this, 'localize' ) );
+		add_action( 'wp_ajax_displayfeaturedimagegenesis_block', array( $fields, 'term_action_callback' ) );
 	}
 
 	/**
diff --git a/includes/widgets/fields/blocks.php b/includes/widgets/fields/blocks.php
index eee35db..510a5d1 100644
--- a/includes/widgets/fields/blocks.php
+++ b/includes/widgets/fields/blocks.php
@@ -8,6 +8,7 @@ return array(
 			__( 'Term', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
+		'nickname' => 'term',
 	),
 	'author' => array(
 		'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),

From 2d6fb2589fe9cd58181cc06e68cd5b2b793c4632 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 12:53:58 -0400
Subject: [PATCH 31/44] Fix the overexcited select watcher

---
 includes/js/block.js     | 4 +++-
 includes/js/block.min.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index aad9232..e68bfee 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -166,7 +166,9 @@
 			value: attributes[key],
 			className: 'displayfeaturedimagegenesis-' + key,
 			onChange: ( value ) => {
-				onChangeSelect( key, value, props, blockName );
+				if ( 'taxonomy' === key ) {
+					onChangeSelect( key, value, props, blockName );
+				}
 				setAttributes( {[key]: value} );
 			}
 		};
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 3029875..9ac2598 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"displayfeaturedimagegenesis/term"===s&&"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file

From bc20b03c5675b5873780c899a5ce61187aae2bdc Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 13:04:51 -0400
Subject: [PATCH 32/44] Update blocks localization

---
 includes/js/block.js                                       | 6 +++---
 includes/js/block.min.js                                   | 2 +-
 ...s-displayfeaturedimagegenesis-widgets-blocks-fields.php | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index e68bfee..192e319 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -289,9 +289,9 @@
 	DFIGBlockObject.params = typeof DisplayFeaturedImageBlock === 'undefined' ? '' : DisplayFeaturedImageBlock;
 
 	if ( typeof DFIGBlockObject.params !== 'undefined' ) {
-		Object.keys( DFIGBlockObject.params ).forEach( function ( key, index ) {
-			if ( DFIGBlockObject.params.hasOwnProperty( key ) ) {
-				DFIGBlockObject.init( DFIGBlockObject.params[ key ] );
+		Object.keys( DFIGBlockObject.params.blocks ).forEach( function ( key, index ) {
+			if ( DFIGBlockObject.params.blocks.hasOwnProperty( key ) ) {
+				DFIGBlockObject.init( DFIGBlockObject.params.blocks[ key ] );
 			}
 		} );
 	}
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 9ac2598..fea48cd 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params).forEach(function(e,t){n.params.hasOwnProperty(e)&&n.init(n.params[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index 8ea33b8..5f6d868 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -22,21 +22,22 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 		$output = array(
 			'ajax_url' => admin_url( 'admin-ajax.php' ),
 			'security' => wp_create_nonce( 'displayfeaturedimagegenesis-block-nonce' ),
+			'blocks'   => array(),
 		);
 		$blocks = include 'fields/blocks.php';
 		foreach ( $blocks as $block => $data ) {
 			if ( empty( $data['nickname'] ) ) {
 				continue;
 			}
-			$common['panels'] = array(
+			$common['panels']           = array(
 				'main' => array(
 					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
 					'initialOpen' => true,
 					'attributes'  => $this->fields( $block ),
 				),
 			);
-			$common['block']  = "displayfeaturedimagegenesis/{$block}";
-			$output[ $block ] = array_merge(
+			$common['block']            = "displayfeaturedimagegenesis/{$block}";
+			$output['blocks'][ $block ] = array_merge(
 				$data,
 				$common
 			);

From cbb6974cf23f15efaa9cad6a7988019b80ddb8d7 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 13:18:45 -0400
Subject: [PATCH 33/44] Remove unneeded nickname

---
 ...lass-displayfeaturedimagegenesis-widgets-blocks-fields.php | 3 ---
 .../class-displayfeaturedimagegenesis-widgets-blocks.php      | 4 ++--
 includes/widgets/fields/blocks.php                            | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index 5f6d868..b96f026 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -26,9 +26,6 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 		);
 		$blocks = include 'fields/blocks.php';
 		foreach ( $blocks as $block => $data ) {
-			if ( empty( $data['nickname'] ) ) {
-				continue;
-			}
 			$common['panels']           = array(
 				'main' => array(
 					'title'       => __( 'Block Settings', 'display-featured-image-genesis' ),
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index a6c0fc2..9b8d095 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -31,7 +31,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 		$output = new DisplayFeaturedImageGenesisWidgetsBlocksOutput();
 		$fields = $this->get_fields_class();
 		foreach ( $this->blocks() as $block => $data ) {
-			if ( empty( $data['nickname'] ) || ! is_callable( array( $output, "render_{$data['nickname']}" ) ) ) {
+			if ( ! is_callable( array( $output, "render_{$block}" ) ) ) {
 				continue;
 			}
 			register_block_type(
@@ -40,7 +40,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 					'editor_script'   => "{$this->block}block",
 					'editor_style'    => "{$this->block}block",
 					'attributes'      => $fields->fields( $block ),
-					'render_callback' => array( $output, "render_{$data['nickname']}" ),
+					'render_callback' => array( $output, "render_{$block}" ),
 				)
 			);
 		}
diff --git a/includes/widgets/fields/blocks.php b/includes/widgets/fields/blocks.php
index 510a5d1..ec7d556 100644
--- a/includes/widgets/fields/blocks.php
+++ b/includes/widgets/fields/blocks.php
@@ -8,7 +8,6 @@ return array(
 			__( 'Term', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
-		'nickname' => 'term',
 	),
 	'author' => array(
 		'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),
@@ -17,7 +16,6 @@ return array(
 			__( 'Author', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
-		'nickname'    => 'author',
 	),
 	'cpt'    => array(
 		'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
@@ -26,6 +24,5 @@ return array(
 			__( 'Post Type', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
-		'nickname'    => 'cpt',
 	),
 );

From fd09e9f34d8a4a84f238270f268533fd6f0894cc Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Tue, 25 Jun 2019 13:19:10 -0400
Subject: [PATCH 34/44] Update deprecated wp.editor to blockEditor

---
 includes/js/block.js     | 8 ++++----
 includes/js/block.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index 192e319..b7318de 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -14,7 +14,7 @@
 	DFIGBlockObject.init = function ( params ) {
 		const registerBlockType = wp.blocks.registerBlockType,
 		      ServerSideRender  = wp.components.ServerSideRender,
-		      InspectorControls = wp.editor.InspectorControls;
+		      InspectorControls = wp.blockEditor.InspectorControls;
 
 		registerBlockType( params.block, {
 			title: params.title,
@@ -36,8 +36,8 @@
 					      setAttributes
 				      }                     = props,
 				      Fragment              = wp.element.Fragment,
-				      BlockControls         = wp.editor.BlockControls,
-				      BlockAlignmentToolbar = wp.editor.BlockAlignmentToolbar;
+				      BlockControls         = wp.blockEditor.BlockControls,
+				      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
 				return [
 					DFIGBlockObject.el( ServerSideRender, {
 						block: params.block,
@@ -82,7 +82,7 @@
 		Object.keys( params.panels ).forEach( function ( key, index ) {
 			if ( params.panels.hasOwnProperty( key ) ) {
 				const IndividualPanel = params.panels[key];
-				panels[index] = DFIGBlockObject.el( PanelBody, {
+				panels[ index ] = DFIGBlockObject.el( PanelBody, {
 					title: IndividualPanel.title,
 					initialOpen: IndividualPanel.initialOpen,
 					className: 'scriptless-panel-' + key
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index fea48cd..0ce7005 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.editor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.editor.BlockControls,m=e.editor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.blockEditor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.blockEditor.BlockControls,m=e.blockEditor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file

From 6810eab3bb6e1730129a2dfaf61fe4550d5e0b39 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 07:16:28 -0400
Subject: [PATCH 35/44] Move placeholder to JS edit

---
 includes/js/block.js                          | 28 ++++++++++++-------
 includes/js/block.min.js                      |  2 +-
 ...uredimagegenesis-widgets-blocks-output.php |  3 --
 includes/widgets/fields/blocks.php            |  2 ++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index b7318de..22c1cc6 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -4,7 +4,8 @@
 
 (function ( wp, undefined ) {
 	'use strict';
-	const DFIGBlockObject = {
+	const prefix          = 'displayfeaturedimagegenesis',
+	      DFIGBlockObject = {
 		el: wp.element.createElement,
 	};
 
@@ -38,11 +39,18 @@
 				      Fragment              = wp.element.Fragment,
 				      BlockControls         = wp.blockEditor.BlockControls,
 				      BlockAlignmentToolbar = wp.blockEditor.BlockAlignmentToolbar;
+				let render = DFIGBlockObject.el( ServerSideRender, {
+					block: params.block,
+					attributes: attributes
+				} );
+				if ( params.placeholder && ! attributes[ params.required ] ) {
+					render = DFIGBlockObject.el( 'div', {
+						className: prefix + '-placeholder',
+					}, params.placeholder );
+				}
+
 				return [
-					DFIGBlockObject.el( ServerSideRender, {
-						block: params.block,
-						attributes: attributes
-					} ),
+					render,
 					DFIGBlockObject.el( Fragment, null,
 						DFIGBlockObject.el( BlockControls, null,
 							DFIGBlockObject.el( BlockAlignmentToolbar, {
@@ -85,7 +93,7 @@
 				panels[ index ] = DFIGBlockObject.el( PanelBody, {
 					title: IndividualPanel.title,
 					initialOpen: IndividualPanel.initialOpen,
-					className: 'scriptless-panel-' + key
+					className: prefix + '-panel-' + key
 				}, _getControls( props, IndividualPanel.attributes, blockName ) );
 			}
 		} );
@@ -164,7 +172,7 @@
 		const control = {
 			label: field.label,
 			value: attributes[key],
-			className: 'displayfeaturedimagegenesis-' + key,
+			className: prefix + '-' + key,
 			onChange: ( value ) => {
 				if ( 'taxonomy' === key ) {
 					onChangeSelect( key, value, props, blockName );
@@ -198,7 +206,7 @@
 	 * @param blockName
 	 */
 	function onChangeSelect( select_id, value, props, blockName ) {
-		if ( 'displayfeaturedimagegenesis/term' !== blockName ) {
+		if ( prefix + '/term' !== blockName ) {
 			return;
 		}
 		const data = _getAjaxData( select_id, value, props );
@@ -215,7 +223,7 @@
 	 */
 	function _getAjaxData( select_id, value, props ) {
 		const data         = {
-			      action: 'displayfeaturedimagegenesis_block',
+			      action: prefix + '_block',
 			      security: DFIGBlockObject.params.security
 		      },
 		      {attributes} = props;
@@ -263,7 +271,7 @@
 	 * @private
 	 */
 	function _modifySelectInput( options, key, attributes ) {
-		const selectID = $( '.displayfeaturedimagegenesis-' + key + ' select' ),
+		const selectID = $( '.' + prefix + '-' + key + ' select' ),
 		      oldValue = attributes[key] || '';
 		selectID.empty();
 		_updateSelectOptions( options, selectID, oldValue );
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 0ce7005..552cf1e 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,s,i){if("displayfeaturedimagegenesis/term"!==i)return;!function(e,o,s){const{attributes:i,setAttributes:r}=s;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const n=$.parseJSON(e);!function(e,t,n){const o=$(".displayfeaturedimagegenesis-"+t+" select"),s=n[t]||"";o.empty(),function(e,t,n){$.each(e,function(e,o){const s=$("<option />").val(e).text(o),i=e?"append":"prepend";t.val(n),t[i](s)})}(e,o,s)}(n,"term",i),o&&r({term:""})})}(function(e,t,o){const s={action:"displayfeaturedimagegenesis_block",security:n.params.security},{attributes:i}=o;s.taxonomy="taxonomy"===e?t:i.taxonomy;return s}(e,o,s),e,s)}n.init=function(t){const s=e.blocks.registerBlockType,i=e.components.ServerSideRender,r=e.blockEditor.InspectorControls;s(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:s=>{const{attributes:a,setAttributes:c}=s,l=e.element.Fragment,u=e.blockEditor.BlockControls,m=e.blockEditor.BlockAlignmentToolbar;return[n.el(i,{block:t.block,attributes:a}),n.el(l,null,n.el(u,null,n.el(m,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{c({blockAlignment:e})}}))),n.el(r,{},function(t,s,i){const r=[],a=e.components.PanelBody;return Object.keys(s.panels).forEach(function(c,l){if(s.panels.hasOwnProperty(c)){const u=s.panels[c];r[l]=n.el(a,{title:u.title,initialOpen:u.initialOpen,className:"scriptless-panel-"+c},function(t,s,i){const r=[];return Object.keys(s).forEach(function(a,c){if(s.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const l=s[a],u=function(t,n){const{TextControl:o,SelectControl:s,RangeControl:i,CheckboxControl:r,TextareaControl:a}=e.components,c=o;return"select"===t?s:"number"===t&&"number"===n?i:"checkbox"===t?r:"textarea"===t?a:c}(l.method,l.type);r[c]=n.el(u,function(e,t,n,s){const{attributes:i,setAttributes:r}=n,a={label:t.label,value:i[e],className:"displayfeaturedimagegenesis-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,n,s),r({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=i[e]),a}(a,l,t,i))}}),r}(t,u.attributes,i))}}),r}(s,t,t.block),o(!1,!1,s))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n="displayfeaturedimagegenesis",o={el:e.element.createElement};function r(e,r,c,l){if(n+"/term"!==l)return;!function(e,r,c){const{attributes:l,setAttributes:s}=c;$.post(o.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const o=$.parseJSON(e);!function(e,t,o){const r=$("."+n+"-"+t+" select"),c=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),c=e?"append":"prepend";t.val(n),t[c](r)})}(e,r,c)}(o,"term",l),r&&s({term:""})})}(function(e,t,r){const c={action:n+"_block",security:o.params.security},{attributes:l}=r;c.taxonomy="taxonomy"===e?t:l.taxonomy;return c}(e,r,c),e,c)}o.init=function(t){const c=e.blocks.registerBlockType,l=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;c(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:c=>{const{attributes:a,setAttributes:i}=c,u=e.element.Fragment,m=e.blockEditor.BlockControls,p=e.blockEditor.BlockAlignmentToolbar;let b=o.el(l,{block:t.block,attributes:a});return t.placeholder&&!a[t.required]&&(b=o.el("div",{className:n+"-placeholder"},t.placeholder)),[b,o.el(u,null,o.el(m,null,o.el(p,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{i({blockAlignment:e})}}))),o.el(s,{},function(t,c,l){const s=[],a=e.components.PanelBody;return Object.keys(c.panels).forEach(function(i,u){if(c.panels.hasOwnProperty(i)){const m=c.panels[i];s[u]=o.el(a,{title:m.title,initialOpen:m.initialOpen,className:n+"-panel-"+i},function(t,c,l){const s=[];return Object.keys(c).forEach(function(a,i){if(c.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const u=c[a],m=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:c,CheckboxControl:l,TextareaControl:s}=e.components,a=o;return"select"===t?r:"number"===t&&"number"===n?c:"checkbox"===t?l:"textarea"===t?s:a}(u.method,u.type);s[i]=o.el(m,function(e,t,o,c){const{attributes:l,setAttributes:s}=o,a={label:t.label,value:l[e],className:n+"-"+e,onChange:t=>{"taxonomy"===e&&r(e,t,o,c),s({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=l[e]),a}(a,u,t,l))}}),s}(t,m.attributes,l))}}),s}(c,t,t.block),r(!1,!1,c))]},save:e=>null})},o.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==o.params&&Object.keys(o.params.blocks).forEach(function(e,t){o.params.blocks.hasOwnProperty(e)&&o.init(o.params.blocks[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index a1bef1f..46b91ef 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -62,9 +62,6 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_term( $atts ) {
-		if ( empty( $atts['term'] ) ) {
-			return '<div class="displayfeaturedimagegenesis-placeholder">' . __( 'Please select a term.', 'sixtenpress' ) . '</div>';
-		}
 		$atts = wp_parse_args( $atts, include 'fields/term-defaults.php' );
 		$term = get_term_by( 'id', $atts['term'], $atts['taxonomy'] );
 		if ( ! $term ) {
diff --git a/includes/widgets/fields/blocks.php b/includes/widgets/fields/blocks.php
index ec7d556..1fe3120 100644
--- a/includes/widgets/fields/blocks.php
+++ b/includes/widgets/fields/blocks.php
@@ -8,6 +8,8 @@ return array(
 			__( 'Term', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
+		'placeholder' => __( 'Please select a term.', 'display-featured-image-genesis' ),
+		'required'    => 'term',
 	),
 	'author' => array(
 		'title'       => __( 'Display Featured Author Profile', 'display-featured-image-genesis' ),

From 5bb6ea10c8988430d4954efa32dae0ddbae56779 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:45:35 -0400
Subject: [PATCH 36/44] Move JS prefix to localized variable, drop unneeded
 block name reference

---
 includes/js/block.js                          | 36 +++++++++----------
 includes/js/block.min.js                      |  2 +-
 ...uredimagegenesis-widgets-blocks-fields.php |  1 +
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index 22c1cc6..6d51726 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -4,8 +4,7 @@
 
 (function ( wp, undefined ) {
 	'use strict';
-	const prefix          = 'displayfeaturedimagegenesis',
-	      DFIGBlockObject = {
+	const DFIGBlockObject = {
 		el: wp.element.createElement,
 	};
 
@@ -45,7 +44,7 @@
 				} );
 				if ( params.placeholder && ! attributes[ params.required ] ) {
 					render = DFIGBlockObject.el( 'div', {
-						className: prefix + '-placeholder',
+						className: DFIGBlockObject.params.prefix + '-placeholder',
 					}, params.placeholder );
 				}
 
@@ -63,7 +62,7 @@
 						),
 					),
 					DFIGBlockObject.el( InspectorControls, {},
-						_getPanels( props, params, params.block ),
+						_getPanels( props, params ),
 						onChangeSelect( false, false, props )
 					)
 				];
@@ -80,11 +79,10 @@
 	 *
 	 * @param props
 	 * @param params
-	 * @param blockName
 	 * @return {Array}
 	 * @private
 	 */
-	function _getPanels( props, params, blockName ) {
+	function _getPanels( props, params ) {
 		const panels    = [],
 		      PanelBody = wp.components.PanelBody;
 		Object.keys( params.panels ).forEach( function ( key, index ) {
@@ -93,8 +91,8 @@
 				panels[ index ] = DFIGBlockObject.el( PanelBody, {
 					title: IndividualPanel.title,
 					initialOpen: IndividualPanel.initialOpen,
-					className: prefix + '-panel-' + key
-				}, _getControls( props, IndividualPanel.attributes, blockName ) );
+					className: DFIGBlockObject.params.prefix + '-panel-' + key
+				}, _getControls( props, IndividualPanel.attributes ) );
 			}
 		} );
 
@@ -106,11 +104,10 @@
 	 *
 	 * @param props
 	 * @param fields
-	 * @param blockName
 	 * @return {Array}
 	 * @private
 	 */
-	function _getControls( props, fields, blockName ) {
+	function _getControls( props, fields ) {
 		const controls = [];
 		Object.keys( fields ).forEach( function ( key, index ) {
 			if ( fields.hasOwnProperty( key ) ) {
@@ -120,7 +117,7 @@
 				}
 				const IndividualField = fields[key],
 				      control         = _getControlType( IndividualField.method, IndividualField.type );
-				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props, blockName ) );
+				controls[index] = DFIGBlockObject.el( control, _getIndividualControl( key, IndividualField, props ) );
 			}
 		} );
 
@@ -163,19 +160,18 @@
 	 * @param key
 	 * @param field
 	 * @param props
-	 * @param blockName
 	 * @return {{label: *, value: *, className: string, onChange: onChange}}
 	 * @private
 	 */
-	function _getIndividualControl( key, field, props, blockName ) {
+	function _getIndividualControl( key, field, props ) {
 		const {attributes, setAttributes} = props;
 		const control = {
 			label: field.label,
 			value: attributes[key],
-			className: prefix + '-' + key,
+			className: DFIGBlockObject.params.prefix + '-' + key,
 			onChange: ( value ) => {
 				if ( 'taxonomy' === key ) {
-					onChangeSelect( key, value, props, blockName );
+					onChangeSelect( key, value, props );
 				}
 				setAttributes( {[key]: value} );
 			}
@@ -203,12 +199,12 @@
 	 * @param select_id
 	 * @param value
 	 * @param props
-	 * @param blockName
 	 */
-	function onChangeSelect( select_id, value, props, blockName ) {
-		if ( prefix + '/term' !== blockName ) {
+	function onChangeSelect( select_id, value, props ) {
+		if ( DFIGBlockObject.params.prefix + '/term' !== props.name ) {
 			return;
 		}
+		console.log( props );
 		const data = _getAjaxData( select_id, value, props );
 		_doAjaxUpdate( data, select_id, props );
 	}
@@ -223,7 +219,7 @@
 	 */
 	function _getAjaxData( select_id, value, props ) {
 		const data         = {
-			      action: prefix + '_block',
+			      action: DFIGBlockObject.params.prefix + '_block',
 			      security: DFIGBlockObject.params.security
 		      },
 		      {attributes} = props;
@@ -271,7 +267,7 @@
 	 * @private
 	 */
 	function _modifySelectInput( options, key, attributes ) {
-		const selectID = $( '.' + prefix + '-' + key + ' select' ),
+		const selectID = $( '.' + DFIGBlockObject.params.prefix + '-' + key + ' select' ),
 		      oldValue = attributes[key] || '';
 		selectID.empty();
 		_updateSelectOptions( options, selectID, oldValue );
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 552cf1e..2a37eaf 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n="displayfeaturedimagegenesis",o={el:e.element.createElement};function r(e,r,c,l){if(n+"/term"!==l)return;!function(e,r,c){const{attributes:l,setAttributes:s}=c;$.post(o.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const o=$.parseJSON(e);!function(e,t,o){const r=$("."+n+"-"+t+" select"),c=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),c=e?"append":"prepend";t.val(n),t[c](r)})}(e,r,c)}(o,"term",l),r&&s({term:""})})}(function(e,t,r){const c={action:n+"_block",security:o.params.security},{attributes:l}=r;c.taxonomy="taxonomy"===e?t:l.taxonomy;return c}(e,r,c),e,c)}o.init=function(t){const c=e.blocks.registerBlockType,l=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;c(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:c=>{const{attributes:a,setAttributes:i}=c,u=e.element.Fragment,m=e.blockEditor.BlockControls,p=e.blockEditor.BlockAlignmentToolbar;let b=o.el(l,{block:t.block,attributes:a});return t.placeholder&&!a[t.required]&&(b=o.el("div",{className:n+"-placeholder"},t.placeholder)),[b,o.el(u,null,o.el(m,null,o.el(p,{value:a.blockAlignment,controls:["wide","full"],onChange:e=>{i({blockAlignment:e})}}))),o.el(s,{},function(t,c,l){const s=[],a=e.components.PanelBody;return Object.keys(c.panels).forEach(function(i,u){if(c.panels.hasOwnProperty(i)){const m=c.panels[i];s[u]=o.el(a,{title:m.title,initialOpen:m.initialOpen,className:n+"-panel-"+i},function(t,c,l){const s=[];return Object.keys(c).forEach(function(a,i){if(c.hasOwnProperty(a)){if(-1!==["blockAlignment","className"].indexOf(a))return;const u=c[a],m=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:c,CheckboxControl:l,TextareaControl:s}=e.components,a=o;return"select"===t?r:"number"===t&&"number"===n?c:"checkbox"===t?l:"textarea"===t?s:a}(u.method,u.type);s[i]=o.el(m,function(e,t,o,c){const{attributes:l,setAttributes:s}=o,a={label:t.label,value:l[e],className:n+"-"+e,onChange:t=>{"taxonomy"===e&&r(e,t,o,c),s({[e]:t})}};return"select"===t.method?a.options=t.options:"number"===t.method?(a.min=t.min,a.max=t.max,"number"!==t.type?a.type="number":a.initialPosition=t.min):"checkbox"===t.method&&(a.checked=l[e]),a}(a,u,t,l))}}),s}(t,m.attributes,l))}}),s}(c,t,t.block),r(!1,!1,c))]},save:e=>null})},o.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==o.params&&Object.keys(o.params.blocks).forEach(function(e,t){o.params.blocks.hasOwnProperty(e)&&o.init(o.params.blocks[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,r){if(n.params.prefix+"/term"!==r.name)return;console.log(r),function(e,o,r){const{attributes:a,setAttributes:s}=r;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const r=$.parseJSON(e);!function(e,t,o){const r=$("."+n.params.prefix+"-"+t+" select"),a=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),a=e?"append":"prepend";t.val(n),t[a](r)})}(e,r,a)}(r,"term",a),o&&s({term:""})})}(function(e,t,o){const r={action:n.params.prefix+"_block",security:n.params.security},{attributes:a}=o;r.taxonomy="taxonomy"===e?t:a.taxonomy;return r}(e,o,r),e,r)}n.init=function(t){const r=e.blocks.registerBlockType,a=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;r(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:r=>{const{attributes:c,setAttributes:l}=r,i=e.element.Fragment,p=e.blockEditor.BlockControls,u=e.blockEditor.BlockAlignmentToolbar;let m=n.el(a,{block:t.block,attributes:c});return t.placeholder&&!c[t.required]&&(m=n.el("div",{className:n.params.prefix+"-placeholder"},t.placeholder)),[m,n.el(i,null,n.el(p,null,n.el(u,{value:c.blockAlignment,controls:["wide","full"],onChange:e=>{l({blockAlignment:e})}}))),n.el(s,{},function(t,r){const a=[],s=e.components.PanelBody;return Object.keys(r.panels).forEach(function(c,l){if(r.panels.hasOwnProperty(c)){const i=r.panels[c];a[l]=n.el(s,{title:i.title,initialOpen:i.initialOpen,className:n.params.prefix+"-panel-"+c},function(t,r){const a=[];return Object.keys(r).forEach(function(s,c){if(r.hasOwnProperty(s)){if(-1!==["blockAlignment","className"].indexOf(s))return;const l=r[s],i=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:a,CheckboxControl:s,TextareaControl:c}=e.components,l=o;return"select"===t?r:"number"===t&&"number"===n?a:"checkbox"===t?s:"textarea"===t?c:l}(l.method,l.type);a[c]=n.el(i,function(e,t,r){const{attributes:a,setAttributes:s}=r,c={label:t.label,value:a[e],className:n.params.prefix+"-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,r),s({[e]:t})}};return"select"===t.method?c.options=t.options:"number"===t.method?(c.min=t.min,c.max=t.max,"number"!==t.type?c.type="number":c.initialPosition=t.min):"checkbox"===t.method&&(c.checked=a[e]),c}(s,l,t))}}),a}(t,i.attributes))}}),a}(r,t),o(!1,!1,r))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index b96f026..f82ed75 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -20,6 +20,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 			'category' => 'widgets',
 		);
 		$output = array(
+			'prefix'   => 'displayfeaturedimagegenesis',
 			'ajax_url' => admin_url( 'admin-ajax.php' ),
 			'security' => wp_create_nonce( 'displayfeaturedimagegenesis-block-nonce' ),
 			'blocks'   => array(),

From 8c14112462f07bdc47a9408a71a012f67d82ae92 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:46:43 -0400
Subject: [PATCH 37/44] Regularize block attributes

---
 ...uredimagegenesis-widgets-blocks-output.php | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index 46b91ef..e875d98 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -18,7 +18,8 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_cpt( $atts ) {
-		$atts      = wp_parse_args( $atts, include 'fields/cpt-defaults.php' );
+		$block_id  = 'cpt';
+		$atts      = $this->update_attributes( $atts, $block_id );
 		$post_type = get_post_type_object( $atts['post_type'] );
 		if ( ! $post_type ) {
 			return '';
@@ -42,8 +43,9 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_author( $atts ) {
-		$atts    = wp_parse_args( $atts, include 'fields/author-defaults.php' );
 		$classes = $this->get_block_classes( $atts, 'author' );
+		$block_id = 'author';
+		$atts     = $this->update_attributes( $atts, $block_id );
 		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
 
 		$output = '<div class="' . esc_attr( $classes ) . '">';
@@ -62,8 +64,9 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_term( $atts ) {
-		$atts = wp_parse_args( $atts, include 'fields/term-defaults.php' );
 		$term = get_term_by( 'id', $atts['term'], $atts['taxonomy'] );
+		$block_id = 'term';
+		$atts     = $this->update_attributes( $atts, $block_id );
 		if ( ! $term ) {
 			return '';
 		}
@@ -80,6 +83,18 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 		return $output;
 	}
 
+	/**
+	 * Update the block attributes by merging with defaults.
+	 *
+	 * @param $atts
+	 * @param $block_id
+	 *
+	 * @return array
+	 */
+	private function update_attributes( $atts, $block_id ) {
+		return wp_parse_args( $atts, include "fields/{$block_id}-defaults.php" );
+	}
+
 	/**
 	 * Get the CSS classes for the block.
 	 *

From 8c06cd5046ccb659a657efda90c3af060d3e2610 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:47:10 -0400
Subject: [PATCH 38/44] Update output prefix constant

---
 ...lass-displayfeaturedimagegenesis-widgets-blocks-output.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index e875d98..5452b96 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -8,7 +8,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	/**
 	 * @var string
 	 */
-	private $block = 'displayfeaturedimagegenesis-';
+	private $block = 'displayfeaturedimagegenesis';
 
 	/**
 	 * Render the widget in a container div.
@@ -105,7 +105,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 */
 	private function get_block_classes( $atts, $block_id ) {
 		$classes = array(
-			"wp-block-{$this->block}{$block_id}",
+			"wp-block-{$this->block}-{$block_id}",
 		);
 		if ( ! empty( $atts['className'] ) ) {
 			$classes[] = $atts['className'];

From aedbb90b977b91300f54452491d9c255ce1f3ce8 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:47:26 -0400
Subject: [PATCH 39/44] Update block output

---
 ...uredimagegenesis-widgets-blocks-output.php | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index 5452b96..ce5af6e 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -25,14 +25,14 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 			return '';
 		}
 
-		$classes = $this->get_block_classes( $atts, 'cpt' );
+		$classes = $this->get_block_classes( $atts, $block_id );
 		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
-		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
+		echo '<div class="' . esc_attr( $classes ) . '">';
 		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
-		$output .= ob_get_contents();
+		echo '</div>';
+		$output = ob_get_contents();
 		ob_clean();
-		$output .= '</div>';
 
 		return $output;
 	}
@@ -43,17 +43,17 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_author( $atts ) {
-		$classes = $this->get_block_classes( $atts, 'author' );
 		$block_id = 'author';
 		$atts     = $this->update_attributes( $atts, $block_id );
+		$classes  = $this->get_block_classes( $atts, $block_id );
 		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
 
-		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
+		echo '<div class="' . esc_attr( $classes ) . '">';
 		new DisplayFeaturedImageGenesisOutputAuthor( $atts, array() );
-		$output .= ob_get_contents();
+		$output = ob_get_contents();
+		echo '</div>';
 		ob_clean();
-		$output .= '</div>';
 
 		return $output;
 	}
@@ -64,21 +64,21 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	 * @return string
 	 */
 	public function render_term( $atts ) {
-		$term = get_term_by( 'id', $atts['term'], $atts['taxonomy'] );
 		$block_id = 'term';
 		$atts     = $this->update_attributes( $atts, $block_id );
+		$term     = get_term_by( 'id', $atts['term'], $atts['taxonomy'] );
 		if ( ! $term ) {
 			return '';
 		}
-		$classes = $this->get_block_classes( $atts, 'term' );
+		$classes = $this->get_block_classes( $atts, $block_id );
 		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-term.php';
 
-		$output = '<div class="' . esc_attr( $classes ) . '">';
 		ob_start();
+		echo '<div class="' . esc_attr( $classes ) . '">';
 		new DisplayFeaturedImageGenesisOutputTerm( $atts, array(), $term );
-		$output .= ob_get_contents();
+		echo '</div>';
+		$output = ob_get_contents();
 		ob_clean();
-		$output .= '</div>';
 
 		return $output;
 	}

From 031c05c47becc563737c38208c6be6965f42196c Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:56:35 -0400
Subject: [PATCH 40/44] Remove logging

---
 includes/js/block.js     | 1 -
 includes/js/block.min.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index 6d51726..bcbbe61 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -204,7 +204,6 @@
 		if ( DFIGBlockObject.params.prefix + '/term' !== props.name ) {
 			return;
 		}
-		console.log( props );
 		const data = _getAjaxData( select_id, value, props );
 		_doAjaxUpdate( data, select_id, props );
 	}
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 2a37eaf..75be630 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,r){if(n.params.prefix+"/term"!==r.name)return;console.log(r),function(e,o,r){const{attributes:a,setAttributes:s}=r;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const r=$.parseJSON(e);!function(e,t,o){const r=$("."+n.params.prefix+"-"+t+" select"),a=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),a=e?"append":"prepend";t.val(n),t[a](r)})}(e,r,a)}(r,"term",a),o&&s({term:""})})}(function(e,t,o){const r={action:n.params.prefix+"_block",security:n.params.security},{attributes:a}=o;r.taxonomy="taxonomy"===e?t:a.taxonomy;return r}(e,o,r),e,r)}n.init=function(t){const r=e.blocks.registerBlockType,a=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;r(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:r=>{const{attributes:c,setAttributes:l}=r,i=e.element.Fragment,p=e.blockEditor.BlockControls,u=e.blockEditor.BlockAlignmentToolbar;let m=n.el(a,{block:t.block,attributes:c});return t.placeholder&&!c[t.required]&&(m=n.el("div",{className:n.params.prefix+"-placeholder"},t.placeholder)),[m,n.el(i,null,n.el(p,null,n.el(u,{value:c.blockAlignment,controls:["wide","full"],onChange:e=>{l({blockAlignment:e})}}))),n.el(s,{},function(t,r){const a=[],s=e.components.PanelBody;return Object.keys(r.panels).forEach(function(c,l){if(r.panels.hasOwnProperty(c)){const i=r.panels[c];a[l]=n.el(s,{title:i.title,initialOpen:i.initialOpen,className:n.params.prefix+"-panel-"+c},function(t,r){const a=[];return Object.keys(r).forEach(function(s,c){if(r.hasOwnProperty(s)){if(-1!==["blockAlignment","className"].indexOf(s))return;const l=r[s],i=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:a,CheckboxControl:s,TextareaControl:c}=e.components,l=o;return"select"===t?r:"number"===t&&"number"===n?a:"checkbox"===t?s:"textarea"===t?c:l}(l.method,l.type);a[c]=n.el(i,function(e,t,r){const{attributes:a,setAttributes:s}=r,c={label:t.label,value:a[e],className:n.params.prefix+"-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,r),s({[e]:t})}};return"select"===t.method?c.options=t.options:"number"===t.method?(c.min=t.min,c.max=t.max,"number"!==t.type?c.type="number":c.initialPosition=t.min):"checkbox"===t.method&&(c.checked=a[e]),c}(s,l,t))}}),a}(t,i.attributes))}}),a}(r,t),o(!1,!1,r))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,r){if(n.params.prefix+"/term"!==r.name)return;!function(e,o,r){const{attributes:a,setAttributes:s}=r;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const r=$.parseJSON(e);!function(e,t,o){const r=$("."+n.params.prefix+"-"+t+" select"),a=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),a=e?"append":"prepend";t.val(n),t[a](r)})}(e,r,a)}(r,"term",a),o&&s({term:""})})}(function(e,t,o){const r={action:n.params.prefix+"_block",security:n.params.security},{attributes:a}=o;r.taxonomy="taxonomy"===e?t:a.taxonomy;return r}(e,o,r),e,r)}n.init=function(t){const r=e.blocks.registerBlockType,a=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;r(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:r=>{const{attributes:c,setAttributes:l}=r,i=e.element.Fragment,p=e.blockEditor.BlockControls,u=e.blockEditor.BlockAlignmentToolbar;let m=n.el(a,{block:t.block,attributes:c});return t.placeholder&&!c[t.required]&&(m=n.el("div",{className:n.params.prefix+"-placeholder"},t.placeholder)),[m,n.el(i,null,n.el(p,null,n.el(u,{value:c.blockAlignment,controls:["wide","full"],onChange:e=>{l({blockAlignment:e})}}))),n.el(s,{},function(t,r){const a=[],s=e.components.PanelBody;return Object.keys(r.panels).forEach(function(c,l){if(r.panels.hasOwnProperty(c)){const i=r.panels[c];a[l]=n.el(s,{title:i.title,initialOpen:i.initialOpen,className:n.params.prefix+"-panel-"+c},function(t,r){const a=[];return Object.keys(r).forEach(function(s,c){if(r.hasOwnProperty(s)){if(-1!==["blockAlignment","className"].indexOf(s))return;const l=r[s],i=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:a,CheckboxControl:s,TextareaControl:c}=e.components,l=o;return"select"===t?r:"number"===t&&"number"===n?a:"checkbox"===t?s:"textarea"===t?c:l}(l.method,l.type);a[c]=n.el(i,function(e,t,r){const{attributes:a,setAttributes:s}=r,c={label:t.label,value:a[e],className:n.params.prefix+"-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,r),s({[e]:t})}};return"select"===t.method?c.options=t.options:"number"===t.method?(c.min=t.min,c.max=t.max,"number"!==t.type?c.type="number":c.initialPosition=t.min):"checkbox"===t.method&&(c.checked=a[e]),c}(s,l,t))}}),a}(t,i.attributes))}}),a}(r,t),o(!1,!1,r))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file

From f7fd26c8034a16dbf24ca0c3b579b307bdb85e48 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:58:16 -0400
Subject: [PATCH 41/44] Set empty options for CPT/author blocks

---
 ...ass-displayfeaturedimagegenesis-widgets-blocks-output.php | 5 ++++-
 .../class-displayfeaturedimagegenesis-widgets-form.php       | 5 ++++-
 includes/widgets/fields/author-user.php                      | 4 +++-
 includes/widgets/fields/blocks.php                           | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index ce5af6e..8b5605c 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -45,8 +45,11 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	public function render_author( $atts ) {
 		$block_id = 'author';
 		$atts     = $this->update_attributes( $atts, $block_id );
-		$classes  = $this->get_block_classes( $atts, $block_id );
 		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
+		if ( empty( $atts['user'] ) ) {
+			return '';
+		}
+		$classes = $this->get_block_classes( $atts, $block_id );
 
 		ob_start();
 		echo '<div class="' . esc_attr( $classes ) . '">';
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
index 69eb132..ba7d7ac 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-form.php
@@ -40,7 +40,10 @@ class DisplayFeaturedImageGenesisWidgetsForm {
 		$output     = 'objects';
 		$post_types = get_post_types( $args, $output );
 
-		$options['post'] = __( 'Posts', 'display-featured-image-genesis' );
+		$options = array(
+			''     => '--',
+			'post' => __( 'Posts', 'display-featured-image-genesis' ),
+		);
 		foreach ( $post_types as $post_type ) {
 			$options[ $post_type->name ] = $post_type->label;
 		}
diff --git a/includes/widgets/fields/author-user.php b/includes/widgets/fields/author-user.php
index 38e49d8..5074aa1 100644
--- a/includes/widgets/fields/author-user.php
+++ b/includes/widgets/fields/author-user.php
@@ -5,7 +5,9 @@ $users   = get_users(
 		'who' => 'authors',
 	)
 );
-$options = array();
+$options = array(
+	'' => '--',
+);
 foreach ( $users as $user ) {
 	$options[ $user->ID ] = $user->data->display_name;
 }
diff --git a/includes/widgets/fields/blocks.php b/includes/widgets/fields/blocks.php
index 1fe3120..9566958 100644
--- a/includes/widgets/fields/blocks.php
+++ b/includes/widgets/fields/blocks.php
@@ -18,6 +18,8 @@ return array(
 			__( 'Author', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
+		'placeholder' => __( 'Please select an author.', 'display-featured-image-genesis' ),
+		'required'    => 'user',
 	),
 	'cpt'    => array(
 		'title'       => __( 'Display Featured Post Type Archive Image', 'display-featured-image-genesis' ),
@@ -26,5 +28,7 @@ return array(
 			__( 'Post Type', 'display-featured-image-genesis' ),
 			__( 'Featured Image', 'display-featured-image-genesis' ),
 		),
+		'placeholder' => __( 'Please select a post type.', 'display-featured-image-genesis' ),
+		'required'    => 'post_type',
 	),
 );

From 243bfff7acfb752bb6836b43329421e840254935 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 08:58:38 -0400
Subject: [PATCH 42/44] Update block output loading

---
 ...aturedimagegenesis-widgets-blocks-output.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
index 8b5605c..ae6efdf 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-output.php
@@ -24,9 +24,9 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 		if ( ! $post_type ) {
 			return '';
 		}
-
 		$classes = $this->get_block_classes( $atts, $block_id );
-		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-cpt.php';
+		$this->include_output_file( $block_id );
+
 		ob_start();
 		echo '<div class="' . esc_attr( $classes ) . '">';
 		new DisplayFeaturedImageGenesisOutputCPT( $atts, array(), $post_type );
@@ -45,11 +45,11 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 	public function render_author( $atts ) {
 		$block_id = 'author';
 		$atts     = $this->update_attributes( $atts, $block_id );
-		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-author.php';
 		if ( empty( $atts['user'] ) ) {
 			return '';
 		}
 		$classes = $this->get_block_classes( $atts, $block_id );
+		$this->include_output_file( $block_id );
 
 		ob_start();
 		echo '<div class="' . esc_attr( $classes ) . '">';
@@ -74,7 +74,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 			return '';
 		}
 		$classes = $this->get_block_classes( $atts, $block_id );
-		include_once plugin_dir_path( dirname( __FILE__ ) ) . 'output/class-displayfeaturedimagegenesis-output-term.php';
+		$this->include_output_file( $block_id );
 
 		ob_start();
 		echo '<div class="' . esc_attr( $classes ) . '">';
@@ -119,4 +119,13 @@ class DisplayFeaturedImageGenesisWidgetsBlocksOutput {
 
 		return implode( ' ', $classes );
 	}
+
+	/**
+	 * Load the block output file.
+	 *
+	 * @param $block_id
+	 */
+	private function include_output_file( $block_id ) {
+		include_once plugin_dir_path( dirname( __FILE__ ) ) . "output/class-displayfeaturedimagegenesis-output-{$block_id}.php";
+	}
 }

From 53f74dedcc8b75784205494e1ade05a890a7efea Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 09:02:03 -0400
Subject: [PATCH 43/44] Remove unneeded number controls/logic

---
 includes/js/block.js                                  | 11 -----------
 includes/js/block.min.js                              |  2 +-
 ...playfeaturedimagegenesis-widgets-blocks-fields.php |  8 +-------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/includes/js/block.js b/includes/js/block.js
index bcbbe61..fc2d007 100644
--- a/includes/js/block.js
+++ b/includes/js/block.js
@@ -135,15 +135,12 @@
 		const {
 			      TextControl,
 			      SelectControl,
-			      RangeControl,
 			      CheckboxControl,
 			      TextareaControl
 		      } = wp.components;
 		const control = TextControl;
 		if ( 'select' === method ) {
 			return SelectControl;
-		} else if ( 'number' === method && 'number' === control_type ) {
-			return RangeControl;
 		} else if ( 'checkbox' === method ) {
 			return CheckboxControl;
 		} else if ( 'textarea' === method ) {
@@ -179,14 +176,6 @@
 
 		if ( 'select' === field.method ) {
 			control.options = field.options;
-		} else if ( 'number' === field.method ) {
-			control.min = field.min;
-			control.max = field.max;
-			if ( 'number' !== field.type ) {
-				control.type = 'number';
-			} else {
-				control.initialPosition = field.min;
-			}
 		} else if ( 'checkbox' === field.method ) {
 			control.checked = attributes[key];
 		}
diff --git a/includes/js/block.min.js b/includes/js/block.min.js
index 75be630..6fc72c7 100644
--- a/includes/js/block.min.js
+++ b/includes/js/block.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,r){if(n.params.prefix+"/term"!==r.name)return;!function(e,o,r){const{attributes:a,setAttributes:s}=r;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const r=$.parseJSON(e);!function(e,t,o){const r=$("."+n.params.prefix+"-"+t+" select"),a=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),a=e?"append":"prepend";t.val(n),t[a](r)})}(e,r,a)}(r,"term",a),o&&s({term:""})})}(function(e,t,o){const r={action:n.params.prefix+"_block",security:n.params.security},{attributes:a}=o;r.taxonomy="taxonomy"===e?t:a.taxonomy;return r}(e,o,r),e,r)}n.init=function(t){const r=e.blocks.registerBlockType,a=e.components.ServerSideRender,s=e.blockEditor.InspectorControls;r(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:r=>{const{attributes:c,setAttributes:l}=r,i=e.element.Fragment,p=e.blockEditor.BlockControls,u=e.blockEditor.BlockAlignmentToolbar;let m=n.el(a,{block:t.block,attributes:c});return t.placeholder&&!c[t.required]&&(m=n.el("div",{className:n.params.prefix+"-placeholder"},t.placeholder)),[m,n.el(i,null,n.el(p,null,n.el(u,{value:c.blockAlignment,controls:["wide","full"],onChange:e=>{l({blockAlignment:e})}}))),n.el(s,{},function(t,r){const a=[],s=e.components.PanelBody;return Object.keys(r.panels).forEach(function(c,l){if(r.panels.hasOwnProperty(c)){const i=r.panels[c];a[l]=n.el(s,{title:i.title,initialOpen:i.initialOpen,className:n.params.prefix+"-panel-"+c},function(t,r){const a=[];return Object.keys(r).forEach(function(s,c){if(r.hasOwnProperty(s)){if(-1!==["blockAlignment","className"].indexOf(s))return;const l=r[s],i=function(t,n){const{TextControl:o,SelectControl:r,RangeControl:a,CheckboxControl:s,TextareaControl:c}=e.components,l=o;return"select"===t?r:"number"===t&&"number"===n?a:"checkbox"===t?s:"textarea"===t?c:l}(l.method,l.type);a[c]=n.el(i,function(e,t,r){const{attributes:a,setAttributes:s}=r,c={label:t.label,value:a[e],className:n.params.prefix+"-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,r),s({[e]:t})}};return"select"===t.method?c.options=t.options:"number"===t.method?(c.min=t.min,c.max=t.max,"number"!==t.type?c.type="number":c.initialPosition=t.min):"checkbox"===t.method&&(c.checked=a[e]),c}(s,l,t))}}),a}(t,i.attributes))}}),a}(r,t),o(!1,!1,r))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
+!function(e,t){"use strict";const n={el:e.element.createElement};function o(e,o,r){if(n.params.prefix+"/term"!==r.name)return;!function(e,o,r){const{attributes:a,setAttributes:c}=r;$.post(n.params.ajax_url,e,function(e){if(t!==e.success&&!1===e.success)return!1;const r=$.parseJSON(e);!function(e,t,o){const r=$("."+n.params.prefix+"-"+t+" select"),a=o[t]||"";r.empty(),function(e,t,n){$.each(e,function(e,o){const r=$("<option />").val(e).text(o),a=e?"append":"prepend";t.val(n),t[a](r)})}(e,r,a)}(r,"term",a),o&&c({term:""})})}(function(e,t,o){const r={action:n.params.prefix+"_block",security:n.params.security},{attributes:a}=o;r.taxonomy="taxonomy"===e?t:a.taxonomy;return r}(e,o,r),e,r)}n.init=function(t){const r=e.blocks.registerBlockType,a=e.components.ServerSideRender,c=e.blockEditor.InspectorControls;r(t.block,{title:t.title,description:t.description,keywords:t.keywords,icon:t.icon,category:t.category,supports:{html:!1},getEditWrapperProps:({blockAlignment:e})=>({"data-align":e}),edit:r=>{const{attributes:s,setAttributes:l}=r,i=e.element.Fragment,p=e.blockEditor.BlockControls,u=e.blockEditor.BlockAlignmentToolbar;let m=n.el(a,{block:t.block,attributes:s});return t.placeholder&&!s[t.required]&&(m=n.el("div",{className:n.params.prefix+"-placeholder"},t.placeholder)),[m,n.el(i,null,n.el(p,null,n.el(u,{value:s.blockAlignment,controls:["wide","full"],onChange:e=>{l({blockAlignment:e})}}))),n.el(c,{},function(t,r){const a=[],c=e.components.PanelBody;return Object.keys(r.panels).forEach(function(s,l){if(r.panels.hasOwnProperty(s)){const i=r.panels[s];a[l]=n.el(c,{title:i.title,initialOpen:i.initialOpen,className:n.params.prefix+"-panel-"+s},function(t,r){const a=[];return Object.keys(r).forEach(function(c,s){if(r.hasOwnProperty(c)){if(-1!==["blockAlignment","className"].indexOf(c))return;const l=r[c],i=function(t,n){const{TextControl:o,SelectControl:r,CheckboxControl:a,TextareaControl:c}=e.components,s=o;return"select"===t?r:"checkbox"===t?a:"textarea"===t?c:s}(l.method,l.type);a[s]=n.el(i,function(e,t,r){const{attributes:a,setAttributes:c}=r,s={label:t.label,value:a[e],className:n.params.prefix+"-"+e,onChange:t=>{"taxonomy"===e&&o(e,t,r),c({[e]:t})}};return"select"===t.method?s.options=t.options:"checkbox"===t.method&&(s.checked=a[e]),s}(c,l,t))}}),a}(t,i.attributes))}}),a}(r,t),o(!1,!1,r))]},save:e=>null})},n.params="undefined"==typeof DisplayFeaturedImageBlock?"":DisplayFeaturedImageBlock,void 0!==n.params&&Object.keys(n.params.blocks).forEach(function(e,t){n.params.blocks.hasOwnProperty(e)&&n.init(n.params.blocks[e])})}(wp);
\ No newline at end of file
diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
index f82ed75..4e6645d 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks-fields.php
@@ -156,10 +156,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 			'label'   => $field['args']['label'],
 			'method'  => $method,
 		);
-		if ( in_array( 'number', array( $field_type, $method ), true ) ) {
-			$attributes['min'] = $field['args']['min'];
-			$attributes['max'] = $field['args']['max'];
-		} elseif ( 'select' === $method ) {
+		if ( 'select' === $method ) {
 			$attributes['options'] = $this->convert_choices_for_select( $field['args']['choices'] );
 		}
 
@@ -175,9 +172,6 @@ class DisplayFeaturedImageGenesisWidgetsBlocksFields {
 	 */
 	private function get_field_type( $method ) {
 		$type = 'string';
-		if ( 'number' === $method ) {
-			return $method;
-		}
 		if ( 'checkbox' === $method ) {
 			return 'boolean';
 		}

From 3d786172ba29510351e8dbf14598841e8d064682 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 26 Jun 2019 09:13:06 -0400
Subject: [PATCH 44/44] Update block prefix/naming

---
 ...layfeaturedimagegenesis-widgets-blocks.php | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
index 9b8d095..8f209bc 100644
--- a/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
+++ b/includes/widgets/class-displayfeaturedimagegenesis-widgets-blocks.php
@@ -6,16 +6,11 @@
 class DisplayFeaturedImageGenesisWidgetsBlocks {
 
 	/**
-	 * The block name.
+	 * The plugin/block prefix.
 	 *
 	 * @var string
 	 */
-	protected $name = 'displayfeaturedimagegenesis/';
-
-	/**
-	 * @var string
-	 */
-	protected $block = 'displayfeaturedimagegenesis-';
+	private $prefix = 'displayfeaturedimagegenesis';
 
 	/**
 	 * @var \DisplayFeaturedImageGenesisWidgetsBlocksFields
@@ -35,10 +30,10 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 				continue;
 			}
 			register_block_type(
-				"{$this->name}{$block}",
+				"{$this->prefix}/{$block}",
 				array(
-					'editor_script'   => "{$this->block}block",
-					'editor_style'    => "{$this->block}block",
+					'editor_script'   => "{$this->prefix}-block",
+					'editor_style'    => "{$this->prefix}-block",
 					'attributes'      => $fields->fields( $block ),
 					'render_callback' => array( $output, "render_{$block}" ),
 				)
@@ -62,12 +57,12 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	public function register_script_style() {
 		$minify  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : ' .min';
 		$version = displayfeaturedimagegenesis_get()->version;
-		wp_register_style( "{$this->block}block", plugin_dir_url( dirname( __FILE__ ) ) . 'css/blocks.css', array(), $version, 'screen' );
+		wp_register_style( "{$this->prefix}-block", plugin_dir_url( dirname( __FILE__ ) ) . 'css/blocks.css', array(), $version, 'screen' );
 		if ( ! $minify ) {
 			$version .= current_time( 'gmt' );
 		}
 		wp_register_script(
-			"{$this->block}block",
+			"{$this->prefix}-block",
 			plugin_dir_url( dirname( __FILE__ ) ) . "js/block{$minify}.js",
 			array( 'wp-blocks', 'wp-element', 'wp-components', 'wp-editor' ),
 			$version,
@@ -80,7 +75,7 @@ class DisplayFeaturedImageGenesisWidgetsBlocks {
 	 */
 	public function localize() {
 		$fields = $this->get_fields_class();
-		wp_localize_script( "{$this->block}block", 'DisplayFeaturedImageBlock', $fields->get_localization_data() );
+		wp_localize_script( "{$this->prefix}-block", 'DisplayFeaturedImageBlock', $fields->get_localization_data() );
 	}
 
 	/**