From bf0141d7bb1587e31ef1d14334e87fb1bc821d98 Mon Sep 17 00:00:00 2001
From: Min-Soo Kim <misol.kr@gmail.com>
Date: Sun, 19 Aug 2018 17:15:59 +0900
Subject: [PATCH] Fix emoticon insert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

이모티콘이 입력되지 않게 수정된 버그 수정. https://github.com/rhymix/rhymix/commit/a16670c6f645493d28c612c4a2eced85a0ddcf16 에 대한 수정.
---
 modules/editor/components/emoticon/tpl/popup.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js
index b13328cdd..bd4e73cdf 100644
--- a/modules/editor/components/emoticon/tpl/popup.js
+++ b/modules/editor/components/emoticon/tpl/popup.js
@@ -1,4 +1,4 @@
-var is_popup = window._isPoped;
+var is_popup = null;
 
 /**
  * @brief Get emoticon list by name
@@ -18,7 +18,7 @@ function completeGetEmoticons(ret_obj) {
 	var emoticons = ret_obj.emoticons.item;
 	var html = [];
 	for(var i=0;i<emoticons.length;i++) {
-		html[html.length] = '<img src="./modules/editor/components/emoticon/tpl/images/'+emoticons[i].filename+'" width="' + parseInt(emoticons[i].width, 10) + '" height="' + parseInt(emoticons[i].height, 10) + '" onclick="insertEmoticon()" onload="setFixedPopupSize()" class="emoticon" />';
+		html[html.length] = '<img src="./modules/editor/components/emoticon/tpl/images/'+emoticons[i].filename+'" width="' + parseInt(emoticons[i].width, 10) + '" height="' + parseInt(emoticons[i].height, 10) + '" onclick="insertEmoticon(this);return false" onload="setFixedPopupSize()" class="emoticon" />';
 	}
 	$('#emoticons').html(html.join(''));
 }
@@ -27,12 +27,12 @@ function completeGetEmoticons(ret_obj) {
  * @brief  Insert a selected emoticon into the document
  * @params Event jQuery event
  */
-function insertEmoticon() {
+function insertEmoticon(obj) {
 	var url, html, iframe, win = is_popup?opener:window;
 
 	if(!win) return;
 
-	html = '<img src="'+this.src+'" width="'+this.width+'" height="'+this.height+'" class="emoticon" />';
+	html = '<img src="'+obj.src+'" width="'+obj.width+'" height="'+obj.height+'" class="emoticon" />';
 
 	win.editorFocus(win.editorPrevSrl);
 	win.editorRelKeys[win.editorPrevSrl].pasteHTML(html);
@@ -43,6 +43,7 @@ function insertEmoticon() {
 }
 
 $(function(){
+	is_popup = window._isPoped;
 	// load default emoticon set
 	getEmoticons('msn');
 	$('#selectEmoticonList').change(function(){ getEmoticons(this.value) });