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] 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
 			);