From a8d1a3f9974b32312bd36279ef84d93bb20de088 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Fri, 18 Nov 2016 23:48:31 +0100
Subject: [PATCH] frio: add a very simple character counter to the jot

---
 view/theme/frio/css/style.css            |   3 +
 view/theme/frio/templates/jot-header.tpl | 246 +++++++++++------------
 view/theme/frio/templates/jot.tpl        |   2 +-
 3 files changed, 126 insertions(+), 125 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index e284310b86..dd1b9b441f 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1157,6 +1157,9 @@ section #jotOpen {
 #profile-jot-wrapper button#jot-submit {
     margin-top: 5px;
 }
+#profile-jot-wrapper #character-counter {
+    padding: 10px 15px;
+}
 
 /* ACL */
 /*#jot-modal-body {
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 792c1d1a3b..145667be9b 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -1,142 +1,140 @@
 
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
 
-{{*<script language="javascript" type="text/javascript">*}}
-
-
-<script>
-var editor=false;
-var textlen = 0;
-var plaintext = '{{$editselect}}';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
-			$("#jot-category").show();
-			$("#jot-category").addClass("jot-category-ex");
-			$("#jot-profile-jot-wrapper").show();
-			$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
-			$("#profile-jot-text").bbco_autocomplete('bbcode');
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}	
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: {{$editselect}},
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			theme_advanced_resizing : true,
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			//force_p_newlines : false,
-			//force_br_newlines : true,
-			forced_root_block : 'div',
-			convert_urls: false,
-			content_css: "{{$baseurl}}/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
+<script type="text/javascript">
+	var editor=false;
+	var textlen = 0;
+	var plaintext = '{{$editselect}}';
+
+	function initEditor(cb){
+		if (editor==false){
+			$("#profile-jot-text-loading").show();
+			if(plaintext == 'none') {
+				$("#profile-jot-text-loading").hide();
+				//$("#profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
+				$("#jot-category").show();
+				$("#jot-category").addClass("jot-category-ex");
+				$("#jot-profile-jot-wrapper").show();
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+				$("#profile-jot-text").bbco_autocomplete('bbcode');
+				editor = true;
+				$("a#jot-perms-icon").colorbox({
+					'inline' : true,
+					'transition' : 'elastic'
 				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
+				$(".jothidden").show();
+				if (typeof cb!="undefined") cb();
+				$("#profile-jot-text").keyup(function(){
+					var textlen = $(this).val().length;
 					$('#character-counter').text(textlen);
 				});
+				return;
+			}	
+			tinyMCE.init({
+				theme : "advanced",
+				mode : "specific_textareas",
+				editor_selector: {{$editselect}},
+				auto_focus: "profile-jot-text",
+				plugins : "bbcode,paste,autoresize, inlinepopups",
+				theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+				theme_advanced_buttons2 : "",
+				theme_advanced_buttons3 : "",
+				theme_advanced_toolbar_location : "top",
+				theme_advanced_toolbar_align : "center",
+				theme_advanced_blockformats : "blockquote,code",
+				theme_advanced_resizing : true,
+				gecko_spellcheck : true,
+				paste_text_sticky : true,
+				entity_encoding : "raw",
+				add_unload_trigger : false,
+				remove_linebreaks : false,
+				//force_p_newlines : false,
+				//force_br_newlines : true,
+				forced_root_block : 'div',
+				convert_urls: false,
+				content_css: "{{$baseurl}}/view/custom_tinymce.css",
+				theme_advanced_path : false,
+				file_browser_callback : "fcFileBrowser",
+				setup : function(ed) {
+					cPopup = null;
+					ed.onKeyDown.add(function(ed,e) {
+						if(cPopup !== null)
+							cPopup.onkey(e);
+					});
+
+					ed.onKeyUp.add(function(ed, e) {
+						var txt = tinyMCE.activeEditor.getContent();
+						match = txt.match(/@([^ \n]+)$/);
+						if(match!==null) {
+							if(cPopup === null) {
+								cPopup = new ACPopup(this,baseurl+"/acl");
+							}
+							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+							if(! cPopup.ready) cPopup = null;
+						}
+						else {
+							if(cPopup !== null) { cPopup.close(); cPopup = null; }
+						}
 
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
+						textlen = txt.length;
+						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+							$('#profile-jot-desc').html(ispublic);
+						}
+						else {
+							$('#profile-jot-desc').html('&nbsp;');
+						}	 
 
-		});
-		editor = true;
+					 //Character count
 
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
+						if(textlen <= 140) {
+							$('#character-counter').removeClass('red');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('grey');
+						}
+						if((textlen > 140) && (textlen <= 420)) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('red');
+							$('#character-counter').addClass('orange');
+						}
+						if(textlen > 420) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('red');
+						}
+						$('#character-counter').text(textlen);
+					});
 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
+					ed.onInit.add(function(ed) {
+						ed.pasteAsPlainText = true;
+						$("#profile-jot-text-loading").hide();
+						$(".jothidden").show();
+						if (typeof cb!="undefined") cb();
+					});
 
-function enableOnUser(){
-	if (editor) return;
-	//$(this).val("");
-	initEditor();
-}
+				}
 
+			});
+			editor = true;
 
+			// setup acl popup
+			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+			}); 
 
+		} else {
+			if (typeof cb!="undefined") cb();
+		}
+	}
 
+	function enableOnUser(){
+		if (editor) return;
+		//$(this).val("");
+		initEditor();
+	}
 </script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
-<script>
+
+<script type="text/javascript">
 	var ispublic = '{{$ispublic}}';
 
 
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 019e71a57c..1c777a8e98 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -38,7 +38,6 @@
 			<form id="profile-jot-form" action="{{$action}}" method="post">
 				<div id="profile-jot-wrapper">
 					<div>
-						<div id="character-counter" class="grey jothidden text-info pull-left"></div>
 						<!--<div id="profile-jot-desc" class="jothidden pull-right">&nbsp;</div>-->
 					</div>
 
@@ -80,6 +79,7 @@
 						-->
 
 						<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
+						<li id="character-counter" class="grey jothidden text-info pull-right"></li>
 						<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
 							<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 						</div> 
-- 
2.39.5