From ac444cba221832c012c0435fdc8339fe9f37febb Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 11 May 2026 18:35:04 +0000
Subject: [PATCH] =Some changes to the CRUD.js editing, timeline post configuration
---
inc/blocks/CustomBlocks.php | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index c68cdb5..6679038 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -161,13 +161,13 @@
);
}
- public function render_core_buttons(array $block):string
+ public function render_core_buttons(array $block, string $content):string
{
return '<ul'.$this->getClassesAndStyles($block['attrs'], ['buttons','row']).'>'.
- $this->innerBlocks($block).'</ul>';
+ $this->inside($block, false, $content).'</ul>';
}
- public function render_core_column(array $block):string
+ public function render_core_column(array $block, string $content):string
{
$styles = (array_key_exists('attrs', $block) &&
array_key_exists('width', $block['attrs'])) ?
@@ -175,25 +175,25 @@
: [];
return '<div'.
$this->getClassesAndStyles($block['attrs'], ['col'], $styles).'>'.
- $this->innerBlocks($block).'</div>';
+ $this->inside($block, false, $content).'</div>';
}
- public function render_core_columns(array $block):string
+ public function render_core_columns(array $block, string $content):string
{
return '<section'.
$this->getClassesAndStyles($block['attrs'], ['columns']).'>'.
- $this->innerBlocks($block).'</section>';
+ $this->inside($block, false, $content).'</section>';
}
//core_comment_template
- public function render_core_group(array $block):string
+ public function render_core_group(array $block, string $content):string
{
$tag = (array_key_exists('tagName', $block['attrs'])) ? $block['attrs']['tagName'] : 'div';
$classes = ($tag === 'main') ?
'' :
$this->getClassesAndStyles($block['attrs'], ['group']);
- return '<'.$tag.$classes.'>'.$this->innerBlocks($block).'</'.$tag.'>';
+ return '<'.$tag.$classes.'>'.$this->inside($block, false, $content).'</'.$tag.'>';
}
//core_home_link
//core_more
@@ -220,12 +220,12 @@
* Media Blocks
*/
//core_audio
- public function render_core_cover(array $block):string
+ public function render_core_cover(array $block, string $content):string
{
// Extract block attributes
$attrs = $block['attrs'] ?? [];
- $innerContent = $this->innerBlocks($block);
+ $innerContent = $this->inside($block, false, $content);
$position = 'object-position: center;';
if (array_key_exists('focalPoint', $attrs)) {
@@ -267,7 +267,7 @@
//core_file
- public function render_core_gallery(array $block):string
+ public function render_core_gallery(array $block, string $content):string
{
return '<ul'.$this->getClassesAndStyles($block['attrs'], ['gallery']).'>'.
$this->innerBlocks($block,'<li>', '</li>').
@@ -295,7 +295,7 @@
$caption.'</figure>';
}
- public function render_core_media_text(array $block):string
+ public function render_core_media_text(array $block, string $content):string
{
$ID = $this->imageID('', $block);
@@ -348,7 +348,8 @@
public function render_core_list(array $block, string $content):string
{
$tag = (array_key_exists('ordered', $block['attrs'])) ? 'ol' : 'ul';
- return '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->innerBlocks($block).'</'.$tag.'>';
+ $output = '<'.$tag.$this->getClassesAndStyles($block['attrs']).'>'.$this->inside($block, false, $content).'</'.$tag.'>';
+ return $output;
}
// public function render_core_list_item(array $block):string
@@ -537,7 +538,7 @@
return '<li'.$classes.'>'.$linkOpen.$block['attrs']['label'].'</a></li>';
}
- public function render_core_navigation_submenu(array $block):string
+ public function render_core_navigation_submenu(array $block, string $content):string
{
global $wp;
$url = (str_starts_with($block['attrs']['url'],'/')) ?
@@ -624,7 +625,7 @@
$result = '';
}
} else {
- $result = $this->inside($block, $tag, $content);
+ $result = $this->inside($block, false, $content);
}
return apply_filters('jvb_post_content_output', $result, $block);
@@ -829,28 +830,21 @@
$beforeHeader = apply_filters('jvbAboveHeader', $beforeHeader);
if ($beforeHeader !== '') {
- $beforeHeader = '<aside class="pre-header">'.$beforeHeader.'</aside>';
+ $beforeHeader = '<aside class="pre header row btw">'.$beforeHeader.'</aside>';
}
- $checked = (is_user_logged_in() && current_user_can('prefers_dark_theme', true)) ? ' checked' : '';
- $title = ($checked == '') ? 'Toggle Dark Mode' : 'Toggle Light Mode';
- $showThemeSwitch = (bool)apply_filters('jvb_show_theme_switch', true);
- $themeSwitch = ($showThemeSwitch) ? '<label title="'.$title.'" id="theme-switch" class="toggle-switch" for="theme-switcher">
- <input class="theme-switch row" id="theme-switcher" name="theme-switcher" type="checkbox"'.$checked.' data-setting="theme" data-theme role="switch" name="dark-mode" aria-label="Toggle dark mode"><span class="slider">'.
- jvbIcon('sun-dim', ['title'=> 'Light Mode']).
- jvbIcon('moon', ['title'=>'Dark Mode']).
- '</span></label>' : '';
+ $themeSwitch = jvbDarkModeToggle();
$breadcrumbs = BreadcrumbManager::getInstance()->renderNavigation();
$afterHeader = apply_filters('jvbBelowHeader', $afterHeader);
if ($afterHeader !== '') {
- $afterHeader = '<aside class="sub-header">'.$afterHeader.'</aside>';
+ $afterHeader = '<aside class="sub header row btw">'.$afterHeader.'</aside>';
}
$footerText = '<div class="scroll-progress"><div class="bar"></div>
</div>';
} elseif ($isFooterTemplate) {
$beforeHeader = apply_filters('jvbBeforeFooter', '');
if ($beforeHeader !== '') {
- $beforeHeader = '<section class="pre-footer">'.$beforeHeader.'</section>';
+ $beforeHeader = '<aside class="footer">'.$beforeHeader.'</aside>';
}
$footerText = jvbRandomFooterText();
}
@@ -894,7 +888,7 @@
}
public function render_core_social_links(array $block, string $content):string
{
- return '<ul class="socials">'.$this->innerBlocks($block).'</ul>';
+ return '<ul class="socials">'.$this->inside($block, false, $content).'</ul>';
}
//core_tag_cloud
--
Gitblit v1.10.0