Issue #34 - Improve Dynamic content block for Attachments, Images and…

… PDF
bobbingwide · Jun 24, 2020 · e64989b · e64989b
1 parent 00e8f06
commit e64989b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/blocks/oik-blockinfo/blockinfo.js b/blocks/oik-blockinfo/blockinfo.js
@@ -32,7 +32,7 @@ function BlockinfoStyled( blockname, showBlockTypeName, showTitle, showDescripti
 
     return(
         <div className={ props.className }>
-            { blockicon } <div>{blockSupportsInserter}</div>
+            { blockicon }<div>{blockSupportsInserter}</div>
             { blockTypeName }
             { blockTitle }
             { blockDescription }

diff --git a/blocks/oik-content/editor.scss b/blocks/oik-content/editor.scss
@@ -0,0 +1,4 @@
+.wp-core-ui .bw_attachment .attachment,
+.wp-core-ui .bw_images .attachment {
+    float: none;
+}
diff --git a/blocks/oik-content/index.js b/blocks/oik-content/index.js
@@ -5,7 +5,7 @@
  * @author Herb Miller @bobbingwide
  */
 //import './style.scss';
-//import './editor.scss';
+import './editor.scss';
 
 // Get just the __() localization function from wp.i18n
 const { __ } = wp.i18n;
@@ -89,7 +89,9 @@ export default registerBlockType(
             customClassName: false,
             className: true,
             html: false,
+            align: true,
             alignWide: true,
+            alignFull: true,
         },
 
         edit,

diff --git a/shortcodes/oik-content.php b/shortcodes/oik-content.php
@@ -23,17 +23,24 @@ function oik_content_block( $attributes ) {
      * We need to set defaults to the same values as in the browser.
      */
     $attributes = oik_content_block_attributes( $attributes );
-	$attributes['post_parent'] = bw_array_get( $attributes, 'post_parent', '0');
+	$attributes['post_parent'] = bw_array_get( $attributes, 'post_parent', null);
 	$attributes['orderby'] = bw_array_get( $attributes, 'orderby', 'date');
 	$attributes['order'] = bw_array_get( $attributes, 'order', 'desc');
 
 
 	switch ( $shortcode ) {
+
 	    case 'bw_attachments':
-	        if ( $attributes['post_parent'] !== '0') {
-                $attributes['post_parent'] = bw_current_post_id();
-            }
+		case 'bw_images':
+		case 'bw_pdf':
+		    if ( $attributes['post_parent'] === '.' ) {
+			    $attributes['post_parent'] = bw_current_post_id();
+		    }
+		    //} elseif ( $attributes['post_parent'] !== '0'   ) {
+            //    $attributes['post_parent'] = bw_current_post_id();
+            //}
 	    	unset( $attributes['post_type']);
+
 	    	//unset( $attributes['post_parent']);
 	    	break;