From 9d1732b3a3d4580ef90060df9578545ec9524801 Mon Sep 17 00:00:00 2001 From: towser451 Date: Thu, 5 Dec 2013 10:03:25 +0800 Subject: [PATCH 1/2] Update emotion.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 开启表情本地化后，添加的表情路径重复。测试发现url参数本身就包含完整的表情路径，与‘editor.options.UMEDITOR_HOME_URL + "dialogs/emotion/"’重复。 --- dialogs/emotion/emotion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dialogs/emotion/emotion.js b/dialogs/emotion/emotion.js index 143a0429..147c1008 100755 --- a/dialogs/emotion/emotion.js +++ b/dialogs/emotion/emotion.js @@ -230,7 +230,7 @@ }, insertSmiley: function( url, evt ) { var obj = { - src:editor.options.emotionLocalization ? editor.options.UMEDITOR_HOME_URL + "dialogs/emotion/" + url : url + src:editor.options.emotionLocalization = url }; obj._src = obj.src; editor.execCommand( 'insertimage', obj ); From 0d4cd177b4476e68a138beb84d83b2f868c26141 Mon Sep 17 00:00:00 2001 From: towser Date: Fri, 6 Dec 2013 09:51:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A1=E6=B3=A1=E8=A1=A8=E6=83=85?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 泡泡表情命名格式和其他表情不一样，多了一个下划线，代码中没有加下划线所以选中表情后无法显示图片 --- dialogs/emotion/emotion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dialogs/emotion/emotion.js b/dialogs/emotion/emotion.js index 147c1008..bac70a9c 100755 --- a/dialogs/emotion/emotion.js +++ b/dialogs/emotion/emotion.js @@ -32,7 +32,7 @@ sourceData: { emotion: { tabNum:7, //切换面板数量 - SmilmgName:{ 'edui-emotion-Jtab0':['j_00', 84], 'edui-emotion-Jtab1':['t_00', 40], 'edui-emotion-Jtab2':['w_00', 52], 'edui-emotion-Jtab3':['B_00', 63], 'edui-emotion-Jtab4':['C_00', 20], 'edui-emotion-Jtab5':['i_f', 50], 'edui-emotion-Jtab6':['y_00', 40] }, //图片前缀名 + SmilmgName:{ 'edui-emotion-Jtab0':['j_00', 84], 'edui-emotion-Jtab1':['t_00', 40], 'edui-emotion-Jtab2':['w_00', 52], 'edui-emotion-Jtab3':['B_00', 63], 'edui-emotion-Jtab4':['C_00', 20], 'edui-emotion-Jtab5':['i_f_', 50], 'edui-emotion-Jtab6':['y_00', 40] }, //图片前缀名 imageFolders:{ 'edui-emotion-Jtab0':'jx2/', 'edui-emotion-Jtab1':'tsj/', 'edui-emotion-Jtab2':'ldw/', 'edui-emotion-Jtab3':'bobo/', 'edui-emotion-Jtab4':'babycat/', 'edui-emotion-Jtab5':'face/', 'edui-emotion-Jtab6':'youa/'}, //图片对应文件夹路径 imageCss:{'edui-emotion-Jtab0':'jd', 'edui-emotion-Jtab1':'tsj', 'edui-emotion-Jtab2':'ldw', 'edui-emotion-Jtab3':'bb', 'edui-emotion-Jtab4':'cat', 'edui-emotion-Jtab5':'pp', 'edui-emotion-Jtab6':'youa'}, //图片css类名 imageCssOffset:{'edui-emotion-Jtab0':35, 'edui-emotion-Jtab1':35, 'edui-emotion-Jtab2':35, 'edui-emotion-Jtab3':35, 'edui-emotion-Jtab4':35, 'edui-emotion-Jtab5':25, 'edui-emotion-Jtab6':35}, //图片偏移