Revert "All smilie versions are getting loaded into SCEDitor #1"

This reverts commit 43108d1.
cYbercOsmOnauT · Jun 11, 2015 · 9488a79 · 9488a79
1 parent 43108d1
commit 9488a79
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 53 deletions.
diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml
diff --git a/.idea/dictionaries/tekin.xml b/.idea/dictionaries/tekin.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/nassim/sceditor/event/sce.php b/nassim/sceditor/event/sce.php
@@ -51,7 +51,8 @@ public function initialize_sceditor () {
 
 		// We need to get all smilies with url and code
 		$sql = 'SELECT smiley_url, code
-			FROM ' . SMILIES_TABLE;
+			FROM ' . SMILIES_TABLE . '
+			GROUP BY smiley_url';
 		// Caching the smilies for 10 minutes should be okay
 		// they don't get changed so often
 		$result = $this->db->sql_query($sql, 600);

diff --git a/nassim/sceditor/styles/all/template/event/simple_footer_after.html b/nassim/sceditor/styles/all/template/event/simple_footer_after.html
diff --git a/nassim/sceditor/styles/all/template/js/sce.js b/nassim/sceditor/styles/all/template/js/sce.js
@@ -78,20 +78,14 @@ $.sceditor.command.set('size', {
 	}
 });
 
-var textarea;
-// This is needed for the smilies popup
-function setSmilie(tag) {
-	textarea.data('sceditor').insert(' ' + tag + ' ');
-}
 
-$(function () {
-	// Don't need to select the node again and again
-	textarea = $('textarea');
-	// Hide the normal BBCode Buttons
+$(document).ready(function () {
 	$('#format-buttons').hide();
 	$('#smiley-box a img').each(function () {
+		$(this).css('cursor', 'pointer');
+
 		$(this).click(function () {
-			setSmilie($(this).attr('alt'));
+			$('textarea').data('sceditor').insert(' ' + $(this).attr('alt') + ' ');
 			return false;
 		});
 	});