From f2a019504c1624507447a35edd08931b909773bc Mon Sep 17 00:00:00 2001
From: Johannes Schwab <Johannes_Schwab@gmx.de>
Date: Sat, 31 Aug 2013 13:50:02 +0200
Subject: [PATCH] Fixed for tinymce and improved appearance

---
 smileybutton/icon.gif         | Bin 306 -> 293 bytes
 smileybutton/smileybutton.css |   7 +++++++
 smileybutton/smileybutton.php |  35 +++++++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/smileybutton/icon.gif b/smileybutton/icon.gif
index e3fe6a55c6c226dedffb4cde18e703529411f8bd..6ce0947194f28f0bd04357af315f529d8262525e 100644
GIT binary patch
literal 293
zcmZ?wbhEHb6k-r!Xkh>WV`F0<AD`&x=*r5<uCA_Gvu4eoKYz)RC2QBN-LPT9rcIj;
z9XfRQ@ZpmuPo6q;>iYHTw{G2f^5n^f4<CO2{{83ApMU@U{r~?TY!Vhi@h1x-7lS;5
z4oD7UCj;xE2kLz(nSG}NMUEHs^?VGu9%{>0ti+WYDAMiQsG%z*e)=(E443q}iHe?r
zEDhHl9Bt^jqSxr4`={51U-V(B!itUA(@r^>{0&l@ynf#AmG{3kL@Q;82(VTO39$-z
z7Rz%BiU_eVdkFC|vxtkNDe-ZMS1>ayVPLKh=TdQBD9pve!nGnmm6O+`Tv)`6ms6da
YOE61JkSkE1o0E%+^SJ(b6-5SX00NL_j{pDw

literal 306
zcmZ?wbhEHb6k-r!Xpv&z=jXSxvkMLmj*pM8sHkXfZ=W({%8VH^=FFM1WXY0c%a*NJ
zv104it=qP3+r4}Do;`bxA3uKb<jG5yF5S6v=jqd@&z?Pd{`~oyH*Y?C`0)Aj=l>W$
z@h1x-7lS;54g(N?>||hF|3JMjCA05zpvdu}zMhXEkzuxM#Y$eSks@8J!GQ{1-EPM|
zRj|yS=5yH8NJq2D!9e?rM1bI#r$QV(r;~kJs#ZiCV`hx0+Ze*9^!kU>Odk~i0ikAz
zc=@W@=C0-@v9??h0oLwjRsmtL3VCip5g`_4-ez8A79o*rB|a{RI%b9q49s;BTq>Sx
tg}GQ*xV8kVa`KAS)QO0T@^Y$ka|t@z3vz|%b8~WWabD5CqoT-Q4FI4}eft0a

diff --git a/smileybutton/smileybutton.css b/smileybutton/smileybutton.css
index bb84030f8..916e04165 100755
--- a/smileybutton/smileybutton.css
+++ b/smileybutton/smileybutton.css
@@ -1,5 +1,12 @@
 
+img.smiley_preview {
+	max-height: 25px;
+	max-width: 25px;
+}
 
+table.smiley-preview {
+	border: 1px solid #AAAAAA;
+}
 
 #smileybutton-enable-label {
 	float: left;
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index d6520a75b..afd3e214c 100755
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -128,8 +128,7 @@ function show_button($a, &$b) {
 	 */
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => ""); //changed
-	call_hooks('smiley', $params);
-
+	call_hooks('smilie', $params);
 
 	/**
 	 *
@@ -137,15 +136,25 @@ function show_button($a, &$b) {
 	 *
 	 */
 
-	$s = "\t";
+	$s = "\t<table class=\"smiley-preview\"><tr>\n";
 	for($x = 0; $x < count($params['texts']); $x ++) {
 		$icon = $params['icons'][$x];
 		$icon = str_replace('/>', 'onclick="smileybutton_addsmiley(\'' . $params['texts'][$x] . '\')"/>', $icon);
-		$s .= $icon . ' ';
-		if ($x != 0 && $x % 10 == 0) {
-			$s .= "<br />\n\t";
+		$icon = str_replace('class="smiley"', 'class="smiley_preview"', $icon);
+		$s .= "<td>" . $icon . "</td>";
+		if (($x+1) % (sqrt(count($params['texts']))+1) == 0) {
+			$s .= "</tr>\n\t<tr>";
 		}
 	}
+	$s .= "\t</tr></table>\n";
+
+	/**
+	 *
+	 * Add css to page
+	 *
+	 */	
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/smileybutton/smileybutton.css' . '" media="all" />' . "\r\n";
 
 	/**
 	 *
@@ -191,9 +200,17 @@ function show_button($a, &$b) {
 	 */
 
 	$b .= "	function smileybutton_addsmiley(text) {\n";
-	$b .= "		v = $(\"#profile-jot-text\").val()\n";
-	$b .= "		v = v + text\n";
-	$b .= "		$(\"#profile-jot-text\").val(v)\n";
+	$b .= "		if(plaintext == 'none') {\n";
+	$b .= "			var v = $(\"#profile-jot-text\").val();\n";
+	$b .= "			v = v + text;\n";
+	$b .= "			$(\"#profile-jot-text\").val(v);\n";
+	$b .= "			$(\"#profile-jot-text\").focus();\n";
+	$b .= "		} else {\n";
+	$b .= "			var v = tinymce.activeEditor.getContent();\n";
+	$b .= "			v = v + text;\n";
+	$b .= "			tinymce.activeEditor.setContent(v);\n";
+	$b .= "			tinymce.activeEditor.focus();\n";
+	$b .= "		}\n";
 	$b .= "	}\n";
 	$b .= "</script>\n";
 }