From cc4f3a827c71f7a9a3c4b77328bb2427759795f4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 21 Jun 2021 18:45:33 +0000
Subject: streamline jot popup for mod hq

---
 Zotlabs/Module/Hq.php    | 6 +-----
 include/conversation.php | 3 ++-
 view/tpl/hq.tpl          | 4 ----
 view/tpl/jot-header.tpl  | 5 +++++
 4 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 view/tpl/hq.tpl

diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index 4d55b76b0..8c126d154 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -113,11 +113,7 @@ class Hq extends \Zotlabs\Web\Controller {
 				'reset'               => t('Reset form')
 			];
 
-			$o = replace_macros(get_markup_template("hq.tpl"),
-				[
-					'$editor' => status_editor($a,$x,false,'Hq')
-				]
-			);
+			$o = status_editor($a, $x, true);
 
 		}
 
diff --git a/include/conversation.php b/include/conversation.php
index 39ff8d7ad..d8f0e8155 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1388,7 +1388,8 @@ function hz_status_editor($a, $x, $popup = false) {
 		'$nocomment_enabled' => t('Comments enabled'),
 		'$nocomment_disabled' => t('Comments disabled'),
 		'$auto_save_draft' => $feature_auto_save_draft,
-		'$reset' => $reset
+		'$reset' => $reset,
+		'$popup' => $popup
 	];
 
 	call_hooks('jot_header_tpl_filter',$tplmacros);
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
deleted file mode 100644
index 099d892bb..000000000
--- a/view/tpl/hq.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="jot-popup">
-{{$editor}}
-</div>
-
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index b24283664..d0e4e9e0e 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -321,12 +321,17 @@ var activeCommentText = '';
 		postSaveChanges('clean');
 
 		{{if $reset}}
+		{{if $popup}}
+		$("#jot-popup").hide();
+		editor = false;
+		{{else}}
 		$(".jothidden").hide();
 		$("#profile-jot-text").removeClass('jot-expanded');
 		$("#profile-jot-tools").addClass('d-none');
 		$("#jot-poll-wrap").addClass('d-none');
 		$("#jot-preview-content").html('').hide();
 		editor = false;
+		{{/if}}
 		{{else}}
 		window.history.back();
 		{{/if}}
-- 
cgit v1.2.3