Merge pull request #1639 from hmhealey/plt1063

PLT-1063 Switched marked to forked version

web/react/package.json

@@ -7,7 +7,7 @@
     "flux": "2.1.1",
     "highlight.js": "8.9.1",
     "keymirror": "0.1.1",
-    "marked": "0.3.5",
+    "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
     "object-assign": "4.0.1",
     "twemoji": "1.4.1"
   },

web/react/utils/emoticons.jsx

@@ -13,7 +13,6 @@ const emoticonPatterns = {
     rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@
     frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :(
     sob: /(^|\s)(:['’]-?\(|:'\(|:'\()(?=$|\s)/g, // :`(
-    kissing_heart: /(^|\s)(:-?\*)(?=$|\s)/g, // :*
     pensive: /(^|\s)(:-?\/)(?=$|\s)/g, // :/
     confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s
     flushed: /(^|\s)(:-?\|)(?=$|\s)/g, // :|

web/react/utils/markdown.jsx

@@ -69,13 +69,11 @@ class MattermostInlineLexer extends marked.InlineLexer {
 
         this.rules = Object.assign({}, this.rules);
 
-        // modified version of the regex that doesn't break up words in snake_case,
-        // allows for links starting with www, and allows links succounded by parentheses
+        // modified version of the regex that allows for links starting with www and those surrounded by parentheses
         // the original is /^[\s\S]+?(?=[\\<!\[_*`~]|https?:\/\/| {2,}\n|$)/
-        this.rules.text = /^[\s\S]+?(?:[^\w\/](?=_)|(?=_\W|[\\<!\[*`~]|https?:\/\/|www\.|\(| {2,}\n|$))/;
+        this.rules.text = /^[\s\S]+?(?=[\\<!\[_*`~]|https?:\/\/|www\.|\(| {2,}\n|$)/;
 
-        // modified version of the regex that allows links starting with www and those surrounded
-        // by parentheses
+        // modified version of the regex that allows links starting with www and those surrounded by parentheses
         // the original is /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/
         this.rules.url = /^(\(?(?:https?:\/\/|www\.)[^\s<.][^\s<]*[^<.,:;"'\]\s])/;