From 2127b1bdd73ecd2423e443992da4b442f5a3c1a3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 04 Feb 2026 21:19:25 +0000
Subject: [PATCH] =Major overhaul of MetaManager.php -> Meta.php and RestRouteManager.php -> Rest.php. Seems to work for JakeVan
---
inc/forms/TaxonomySelector.php | 86 +++++++++++++++++++++++--------------------
1 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/inc/forms/TaxonomySelector.php b/inc/forms/TaxonomySelector.php
index 8156ebb..bcc5a3b 100644
--- a/inc/forms/TaxonomySelector.php
+++ b/inc/forms/TaxonomySelector.php
@@ -35,7 +35,6 @@
$this->title = JVB_TAXONOMY[$this->name]['plural'];
$this->base = $config['base']??'';
-
$this->config = wp_parse_args($config, [
'types' => false, // for feed block implementation
'max' => 0, // 0 = unlimited
@@ -65,14 +64,14 @@
*/
public static function getTermPath(WP_Term $term, bool $returnArray = false): string|array {
if (!is_taxonomy_hierarchical($term->taxonomy)) {
- return $term->name;
+ return html_entity_decode($term->name);
}
$path = [];
$currentTerm = $term;
while ($currentTerm) {
- array_unshift($path, $currentTerm->name);
+ array_unshift($path, html_entity_decode($currentTerm->name));
if ($currentTerm->parent) {
$currentTerm = get_term($currentTerm->parent);
@@ -99,11 +98,8 @@
<h3 id="modal-title">Select Taxonomy</h3>
</header>
- <div class="selected-items-section">
- <div class="selected-items row" role="region" aria-label="Selected items">
- <!-- Selected items will be populated here -->
- </div>
- </div>
+
+ <div class="selected-items row" role="region" aria-label="Selected items"></div>
<div class="items-wrap">
<!-- Common/Favorite terms section -->
@@ -122,15 +118,16 @@
</button>
</nav>
+
+ <p class="message" hidden aria-live="polite">
+ { <span>loading items</span> }
+ </p>
<!-- Terms list -->
<ul class="items-container col start" role="listbox" aria-label="Available terms">
<!-- Terms will be populated here -->
</ul>
- <!-- Loading indicator -->
- <p class="loading" hidden aria-live="polite">
- <span>loading items</span>
- </p>
+ <button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>
<!-- Infinite scroll sentinel -->
<div class="scroll-sentinel" aria-hidden="true"></div>
@@ -139,7 +136,7 @@
<!-- Search section -->
<div class="search-wrapper">
<div class="search-bar">
- <?= jvbSearch('Search terms') ?>
+ <?= jvbSearch('Search terms', 'search-terms') ?>
</div>
</div>
@@ -159,14 +156,8 @@
<option value="0">None (Top Level)</option>
</select>
</div>
-
- <button type="button" class="submit-term">Add Term</button>
</form>
- <div class="term-suggestions" hidden><h4></h4><ul class="term-suggestion-list"></ul></div>
- <div class="loading-message create-term" hidden>
- <span id="typed-text"></span>
- <span class="cursor">|</span>
- </div>
+
</div>
</details>
<?= jvbModalActions(); ?>
@@ -175,18 +166,15 @@
<template class="loadingItems">
<p>{ <span>loading items</span> }</p>
</template>
- <template class="autocompleteButton">
- <button class="autocomplete submit-term" type="button"><strong>Create: </strong><span></span></button>
- </template>
<template class="autocompleteItem">
- <button class="autocomplete item" type="button" data-autocomplete-select></button>
+ <li class="autocomplete item btn"></li>
</template>
<template class="noTermResults">
<p>{ <span>nothing found</span> }</p>
</template>
<template class="termListItem">
<li>
- <input type ="checkbox">
+ <input type="checkbox">
<label>
<span class="term-name"></span>
</label>
@@ -200,7 +188,7 @@
<template class="selectedTerm">
<div class="selected-item row">
<span class="item-name"></span>
- <button type="button" class="remove-item row"><?=jvbIcon('x')?></button>
+ <button type="button" class="remove-term row"><?=jvbIcon('x')?></button>
</div>
</template>
<template class="termBreadcrumb">
@@ -252,19 +240,28 @@
</button>
<?php if ($hasAutocomplete !== '') { ?>
<input type="text" id="<?= $this->base ?><?= esc_attr($this->config['name']) ?>-autocomplete" autocomplete="off" data-ignore data-autocomplete>
- <ul class="search-results" hidden>
- </ul>
+ <p class="message" hidden aria-live="polite">
+ { <span>loading items</span> }
+ </p>
+ <div class="auto-wrapper" hidden>
+ <ul class="search-results">
+ </ul>
+ <button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>
+ </div>
+
<?php } ?>
</div>
-
- <div class="selected-items row" role="region" aria-label="Selected <?= esc_attr($this->plural) ?>">
- <?php if (!empty($selected)): ?>
- <?php foreach ($selected as $termId): ?>
- <?php $this->renderSelectedTerm($termId); ?>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
+ <?php
+ $selectedItems = '';
+ if (!empty($selected)):
+ ob_start();
+ foreach ($selected as $termId):
+ $this->renderSelectedTerm($termId);
+ endforeach;
+ $selectedItems = ob_get_clean();
+ endif;
+ ?>
+ <div class="selected-items row" role="region" aria-label="Selected <?= esc_attr($this->plural) ?>"><?=$selectedItems?></div>
<?= $extra ?>
</div>
<?php
@@ -273,7 +270,16 @@
protected function renderTaxonomyToggle(array $selected = [], string $extra = ''): string
{
- return '<button type="button" data-filter="taxonomy" data-taxonomy="'.$this->name.'" title="Filter by '.$this->singular.'">'.jvbIcon($this->config['icon']).'<span class="label">'.$this->singular.'</span></button>';
+ return sprintf(
+ '<button type="button" data-icon="%s" data-filter="taxonomy" data-taxonomy="%s" data-type="selector" data-single="%s" data-plural="%s" title="Filter by %s">%s<span class="label">%s</span></button>',
+ JVB_TAXONOMY[$this->name]['icon'],
+ $this->name,
+ $this->singular,
+ $this->plural,
+ $this->singular,
+ jvbIcon($this->config['icon']),
+ $this->singular
+ );
}
/**
@@ -335,8 +341,8 @@
<div class="selected-item row" data-id="<?= esc_attr($termId) ?>">
<span><?= esc_html($termPath) ?></span>
<button type="button"
- class="remove-item row"
- aria-label="Remove <?= esc_attr($term->name) ?>">
+ class="remove-term row"
+ aria-label="Remove <?= html_entity_decode($term->name) ?>">
<?= jvbIcon('x') ?>
</button>
</div>
--
Gitblit v1.10.0