Skip to content

Commit 0bf73ca

Browse files
author
Pandao
committed
fix emoji bugs
1 parent 91351a0 commit 0bf73ca

8 files changed

Lines changed: 51 additions & 27 deletions

File tree

‎editormd.amd.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,13 +2844,14 @@
28442844
};
28452845

28462846
editormd.regexs = {
2847-
atLink : /@(\w+)/g,
2848-
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2849-
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2850-
emoji : /:([\-\w]+):/g,
2851-
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2852-
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2853-
editormdLogo : /:(editormd-logo-?(\w+)?):/g
2847+
atLink : /@(\w+)/g,
2848+
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2849+
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2850+
emoji : /:([\-\w]+):/g,
2851+
emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
2852+
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2853+
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2854+
editormdLogo : /:(editormd-logo-?(\w+)?):/g
28542855
};
28552856

28562857
// Emoji graphics files url path
@@ -2900,6 +2901,11 @@
29002901
var editormdLogoReg = editormd.regexs.editormdLogo;
29012902

29022903
markedRenderer.emoji = function(text) {
2904+
2905+
text = text.replace(editormd.regexs.emojiDatetime, function($1) {
2906+
return $1.replace(/:/g, ":");
2907+
});
2908+
29032909
var matchs = text.match(emojiReg);
29042910

29052911
if (!matchs || !settings.emoji) {

‎editormd.amd.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editormd.amd.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editormd.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,13 +2774,14 @@
27742774
};
27752775

27762776
editormd.regexs = {
2777-
atLink : /@(\w+)/g,
2778-
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2779-
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2780-
emoji : /:([\-\w]+):/g,
2781-
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2782-
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2783-
editormdLogo : /:(editormd-logo-?(\w+)?):/g
2777+
atLink : /@(\w+)/g,
2778+
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2779+
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2780+
emoji : /:([\-\w]+):/g,
2781+
emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
2782+
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2783+
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2784+
editormdLogo : /:(editormd-logo-?(\w+)?):/g
27842785
};
27852786

27862787
// Emoji graphics files url path
@@ -2830,6 +2831,11 @@
28302831
var editormdLogoReg = editormd.regexs.editormdLogo;
28312832

28322833
markedRenderer.emoji = function(text) {
2834+
2835+
text = text.replace(editormd.regexs.emojiDatetime, function($1) {
2836+
return $1.replace(/:/g, ":");
2837+
});
2838+
28332839
var matchs = text.match(emojiReg);
28342840

28352841
if (!matchs || !settings.emoji) {

‎editormd.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editormd.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/emoji.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ <h1>Emoji表情</h1>
158158

159159
&gt; dd:smiley:引用文本(Blockquotes:smiley:)fdasfad :fa-star:: dfd :fa-truck: @pandao
160160

161+
#### Datetime test
162+
163+
02:21:47
164+
165+
2015-03-12 02:21:47
166+
161167
###Table
162168

163169
|:100: First Header | Second:smiley: Header:smiley: |

‎src/editormd.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2762,13 +2762,14 @@
27622762
};
27632763

27642764
editormd.regexs = {
2765-
atLink : /@(\w+)/g,
2766-
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2767-
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2768-
emoji : /:([\-\w]+):/g,
2769-
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2770-
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2771-
editormdLogo : /:(editormd-logo-?(\w+)?):/g
2765+
atLink : /@(\w+)/g,
2766+
email : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
2767+
emailLink : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
2768+
emoji : /:([\-\w]+):/g,
2769+
emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
2770+
twemoji : /:(tw-([\w]+)-?(\w+)?):/g,
2771+
fontAwesome : /:(fa-([\w]+)(-(\w+)){0,}):/g,
2772+
editormdLogo : /:(editormd-logo-?(\w+)?):/g
27722773
};
27732774

27742775
// Emoji graphics files url path
@@ -2818,6 +2819,11 @@
28182819
var editormdLogoReg = editormd.regexs.editormdLogo;
28192820

28202821
markedRenderer.emoji = function(text) {
2822+
2823+
text = text.replace(editormd.regexs.emojiDatetime, function($1) {
2824+
return $1.replace(/:/g, "&#58;");
2825+
});
2826+
28212827
var matchs = text.match(emojiReg);
28222828

28232829
if (!matchs || !settings.emoji) {

0 commit comments

Comments
 (0)