Merge pull request pandao#244 from Yutyrannus/master

类似x:x:x的时间格式也不会被解析为emoji
scopier · May 15, 2016 · b02dbce · b02dbce
2 parents af08536 + 763863a
commit b02dbce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/editormd.js b/src/editormd.js
@@ -3343,7 +3343,7 @@
         email         : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
         emailLink     : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
         emoji         : /:([\w\+-]+):/g,
-        emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
+        emojiDatetime : /(\d{1,2}:\d{1,2}:\d{1,2})/g,
         twemoji       : /:(tw-([\w]+)-?(\w+)?):/g,
         fontAwesome   : /:(fa-([\w]+)(-(\w+)){0,}):/g,
         editormdLogo  : /:(editormd-logo-?(\w+)?):/g,