[K6.0] The spoiler changes from Click to expand to true (part 3) #9458

Kunena · Jan 26, 2023 · 3c8f754 · 3c8f754
1 parent 172ca9a
commit 3c8f754
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 30 deletions.
diff --git a/src/libraries/kunena/src/BBCode/KunenaBBCode.php b/src/libraries/kunena/src/BBCode/KunenaBBCode.php
@@ -1540,12 +1540,6 @@ public function DoSpoiler($bbcode, $action, $name, $default, $params, $content)
         $title    = $default ? $default : Text::_('COM_KUNENA_BBCODE_SPOILER');
         $hidden   = ($document instanceof HtmlDocument);
 
-        if ($bbcode->parent->message instanceof KunenaMessage) {
-            $message_id = $bbcode->parent->message->id;
-        } else {
-            $message_id = $bbcode->parent->id;
-        }
-
         $layout = KunenaLayout::factory('BBCode/Spoiler');
 
         if ($layout->getPath()) {
@@ -1555,7 +1549,6 @@ public function DoSpoiler($bbcode, $action, $name, $default, $params, $content)
                 ->set('title', htmlspecialchars($title, ENT_COMPAT, 'UTF-8'))
                 ->set('hidden', $hidden)
                 ->set('content', $content)
-                ->set('message_id', $message_id)
                 ->set('params', $params);
         }
 

diff --git a/src/site/template/aurelia/assets/js/topic.js b/src/site/template/aurelia/assets/js/topic.js
@@ -10,17 +10,12 @@
 jQuery(document).ready(function ($) {
 
 	/* To hide or open spoiler on click */
-	var collapseElementList = [].slice.call(document.querySelectorAll('.collapse'))
-	var collapseList = collapseElementList.map(function (collapseEl) {
-        collapseEl.addEventListener('shown.bs.collapse', function (mopt) {
-            var idString = collapseEl.id;
-            $('#collapse-btn'+idString.substr(15)).html(Joomla.Text._('COM_KUNENA_LIB_BBCODE_SPOILER_HIDE'));
-        })
-        collapseEl.addEventListener('hidden.bs.collapse', function (mopt) {
-            var idString = collapseEl.id;
-            $('#collapse-btn'+idString.substr(15)).html(Joomla.Text._('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND'));
-        })
-    })
+	$(document).on('click', '.kspoiler-expand', function (e) {
+		e.preventDefault()
+		const show = $(this.children[0]).val() === Joomla.Text._('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND');
+		$(this.children[0]).val(show ? Joomla.Text._('COM_KUNENA_LIB_BBCODE_SPOILER_HIDE') : Joomla.Text._('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND'));
+		$(this).parent().children('.kspoiler-wrapper').toggle()
+	});
 
 	/* To allow to close or open the quick-reply modal box */
 	$('.openmodal').click(function () {

diff --git a/src/site/template/aurelia/layouts/bbcode/spoiler/default.php b/src/site/template/aurelia/layouts/bbcode/spoiler/default.php
@@ -24,16 +24,18 @@
 Text::script('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND');
 ?>
 
-<p>
-  <div class="kspoiler-title" style="display:inline-block;">
-    <?php echo $this->title; ?>
-  </div>
-  <a class="btn btn-primary" id="collapse-btn<?php echo $this->message_id ?>" data-bs-toggle="collapse" href="#collapseSpoiler<?php echo $this->message_id ?>" role="button" aria-expanded="false" aria-controls="collapseSpoiler<?php echo $this->message_id ?>">
-    <?php echo Text::_('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND'); ?>
-  </a>
-</p>
-<div class="collapse" id="collapseSpoiler<?php echo $this->message_id ?>">
-  <div class="card card-body">
-    <?php echo $this->content; ?>
-  </div>
+<div class="kspoiler">
+    <div class="kspoiler-header">
+        <div class="kspoiler-title" style="display:inline-block;">
+            <?php echo $this->title; ?>
+        </div>
+        <div class="kspoiler-expand" style="display:inline-block;">
+            <input class="btn btn-primary" type="button" id="kspoiler-show" value="<?php echo Text::_('COM_KUNENA_LIB_BBCODE_SPOILER_EXPAND'); ?>"/>
+        </div>
+        <div class="kspoiler-wrapper" style="display:none;">
+            <div class="kspoiler-content">
+                <?php echo $this->content; ?>
+            </div>
+        </div>
+    </div>
 </div>