Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Revert "Fix a bug that emoticon of <3 and >:) cannot display correctly in the message."

Browse Source 
This reverts commit f7e7d1a658.
This commit is contained in:
Derek Wang 2014-05-19 22:03:26 +08:00
parent f7e7d1a658
commit 40bc3ec55d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
converse.js
View File

@ -60,7 +60,6 @@
if (this.length > 0) { if (this.length > 0) {
this.each(function(i, obj) { this.each(function(i, obj) {
var text = $(obj).html(); var text = $(obj).html();
text = text.replace(/&gt;:\)/g, '<span class="emoticon icon-evil"></span>');
text = text.replace(/:\)/g, '<span class="emoticon icon-smiley"></span>'); text = text.replace(/:\)/g, '<span class="emoticon icon-smiley"></span>');
text = text.replace(/:\-\)/g, '<span class="emoticon icon-smiley"></span>'); text = text.replace(/:\-\)/g, '<span class="emoticon icon-smiley"></span>');
text = text.replace(/;\)/g, '<span class="emoticon icon-wink"></span>'); text = text.replace(/;\)/g, '<span class="emoticon icon-wink"></span>');
@ -72,6 +71,7 @@
text = text.replace(/:p/g, '<span class="emoticon icon-tongue"></span>'); text = text.replace(/:p/g, '<span class="emoticon icon-tongue"></span>');
text = text.replace(/:\-p/g, '<span class="emoticon icon-tongue"></span>'); text = text.replace(/:\-p/g, '<span class="emoticon icon-tongue"></span>');
text = text.replace(/8\)/g, '<span class="emoticon icon-cool"></span>'); text = text.replace(/8\)/g, '<span class="emoticon icon-cool"></span>');
text = text.replace(/&gt;:\)/g, '<span class="emoticon icon-evil"></span>');
text = text.replace(/:S/g, '<span class="emoticon icon-confused"></span>'); text = text.replace(/:S/g, '<span class="emoticon icon-confused"></span>');
text = text.replace(/:\\/g, '<span class="emoticon icon-wondering"></span>'); text = text.replace(/:\\/g, '<span class="emoticon icon-wondering"></span>');
text = text.replace(/:\/ /g, '<span class="emoticon icon-wondering"></span>'); text = text.replace(/:\/ /g, '<span class="emoticon icon-wondering"></span>');
@ -82,7 +82,7 @@
text = text.replace(/:\-O/g, '<span class="emoticon icon-shocked"></span>'); text = text.replace(/:\-O/g, '<span class="emoticon icon-shocked"></span>');
text = text.replace(/\=\-O/g, '<span class="emoticon icon-shocked"></span>'); text = text.replace(/\=\-O/g, '<span class="emoticon icon-shocked"></span>');
text = text.replace(/\(\^.\^\)b/g, '<span class="emoticon icon-thumbs-up"></span>'); text = text.replace(/\(\^.\^\)b/g, '<span class="emoticon icon-thumbs-up"></span>');
text = text.replace(/&lt;3/g, '<span class="emoticon icon-heart"></span>'); text = text.replace(/<3/g, '<span class="emoticon icon-heart"></span>');
$(obj).html(text); $(obj).html(text);
}); });
} }