implement jot reset button

6 files changed, 37 insertions, 6 deletions

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 2d6307eb1..82c88e565 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -185,7 +185,8 @@ class Network extends \Zotlabs\Web\Controller {
 				'editor_autocomplete' => true,
 				'bbco_autocomplete' => 'bbcode',
 				'bbcode' => true,
-				'jotnets' => true
+				'jotnets' => true,
+				'reset' => t('Reset form')
 			);
 			if($deftag)
 				$x['pretext'] = $deftag;
diff --git a/boot.php b/boot.php
index 48b32d45b..36f50533b 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.5.5' );
+define ( 'STD_VERSION',             '3.5.6' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
 
diff --git a/include/conversation.php b/include/conversation.php
index 3041d2e21..4a1cdc7da 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1304,6 +1304,8 @@ function status_editor($a, $x, $popup = false) {
 		$id_select = '';
 
 	$webpage = ((x($x,'webpage')) ? $x['webpage'] : '');
+
+	$reset = ((x($x,'reset')) ? $x['reset'] : '');
 	
 	$feature_auto_save_draft = ((feature_enabled($x['profile_uid'], 'auto_save_draft')) ? "true" : "false");
 	
@@ -1329,6 +1331,7 @@ function 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
 	));
 
 	$tpl = get_markup_template('jot.tpl');
@@ -1441,7 +1444,8 @@ function status_editor($a, $x, $popup = false) {
 		'$expiryModalCANCEL' => t('Cancel'),
 		'$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false),
 		'$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false),
-		'$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0)
+		'$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0),
+		'$reset' => $reset
 	));
 
 	if ($popup === true) {
diff --git a/view/css/conversation.css b/view/css/conversation.css
index cff59aecb..81792b48e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -27,6 +27,16 @@
 	padding: 0.5rem;
 }
 
+#jot-text-wrap {
+	position: relative;
+}
+
+#profile-jot-reset {
+	position: absolute;
+	top: 0px;
+	right: 0px;
+}
+
 #profile-jot-text {
 	resize: none;
 	border-width: 0px;
@@ -39,6 +49,7 @@
 
 #profile-jot-text.jot-expanded {
 	resize: vertical;
+	height: 200px;
 }
 
 #profile-jot-text.hover {
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f2b68ece0..39aa9d9c4 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,10 +7,11 @@ var pretext = '{{$pretext}}';
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();
+		$("#profile-jot-reset").removeClass('d-none');
 		{{$geotag}}
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200 });
+			//$("#profile-jot-text").css({ 'height': 200 });
 			{{if $bbco_autocomplete}}
 			$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
 			{{/if}}
@@ -361,8 +362,16 @@ var activeCommentText = '';
 		$("#jot-title").val('');
 		$("#profile-jot-text").val('');
 		$("#jot-category").val('');
-		postSaveChanges('clean','');
+		postSaveChanges('clean');
+
+		{{if $reset}}
+		$(".jothidden").hide();
+		$("#profile-jot-text").removeClass('jot-expanded');
+		$("#profile-jot-reset").addClass('d-none');
+		editor = false;
+		{{else}}
 		window.history.back();
+		{{/if}}
 	}
 
 	function itemFiler(id) {
@@ -573,7 +582,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 <script>
 	var postSaveTimer = null;
 
-	function postSaveChanges(action, type) {
+	function postSaveChanges(action) {
 		if({{$auto_save_draft}}) {
 
 			var doctype = $('#jot-webpage').val();
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 9aa330c40..0d1b4bd0d 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -9,6 +9,7 @@
 	</div>
 	{{/if}}
 	<div class="mb-4" id="profile-jot-wrapper">
+
 		{{if $parent}}
 		<input type="hidden" name="parent" value="{{$parent}}" />
 		{{/if}}
@@ -41,6 +42,11 @@
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
+			{{if $reset}}
+			<button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
+				<i class="fa fa-close"></i>
+			</button>
+			{{/if}}
 			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
 		</div>
 		{{if $attachment}}