fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-27 23:29:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix emoticon insert

Browse source 
이모티콘이 입력되지 않게 수정된 버그 수정. a16670c6f6 에 대한 수정.
This commit is contained in:
Min-Soo Kim 2018-08-19 17:15:59 +09:00 • committed by GitHub
parent a16670c6f6
commit bf0141d7bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/editor/components/emoticon/tpl/popup.js
View file

@ -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) });