From cf09e200a57a7487aab874ba706d9fe674e0d7d2 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 Mar 2013 14:33:27 -0500
Subject: [PATCH] Moved Markdown out of Discourse.Utilities ->
 Discourse.Markdown

---
 .../discourse/components/markdown.js          | 188 ++++++++++++++++++
 .../discourse/components/utilities.js         | 117 +----------
 .../discourse/views/composer_view.js          |   2 +-
 .../discourse/views/pagedown_editor.js        |   2 +-
 app/assets/javascripts/pagedown_custom.js     |  28 ++-
 lib/pretty_text.rb                            |   3 +-
 spec/javascripts/components/markdown_spec.js  | 124 ++++++++++++
 spec/javascripts/components/utilities_spec.js | 119 -----------
 .../assets/javascripts/discourse_emoji.js     |   2 +-
 9 files changed, 330 insertions(+), 255 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/markdown.js
 create mode 100644 spec/javascripts/components/markdown_spec.js

diff --git a/app/assets/javascripts/discourse/components/markdown.js b/app/assets/javascripts/discourse/components/markdown.js
new file mode 100644
index 000000000..4ede5514c
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/markdown.js
@@ -0,0 +1,188 @@
+/*global sanitizeHtml:true Markdown:true */
+
+/**
+  Contains methods to help us with markdown formatting.
+
+  @class Markdown
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.Markdown = {
+
+  /**
+    Convert a raw string to a cooked markdown string.
+
+    @method cook
+    @param {String} raw the raw string we want to apply markdown to
+    @param {Object} opts the options for the rendering
+  **/
+  cook: function(raw, opts) {
+    if (!opts) opts = {};
+
+    // Make sure we've got a string
+    if (!raw) return "";
+    if (raw.length === 0) return "";
+
+    this.converter = this.markdownConverter(opts);
+    return this.converter.makeHtml(raw);
+  },
+
+  /**
+    Creates a new markdown editor
+
+    @method createNewMarkdownEditor
+    @param {Markdown.Converter} markdownConverter the converter object
+    @param {String} idPostfix
+    @param {Object} options the options for the markdown editor
+  **/
+  createNewMarkdownEditor: function(markdownConverter, idPostfix, options) {
+    options = options || {};
+    options.strings = {
+      bold: I18n.t("js.composer.bold_title") + " <strong> Ctrl+B",
+      boldexample: I18n.t("js.composer.bold_text"),
+
+      italic: I18n.t("js.composer.italic_title") + " <em> Ctrl+I",
+      italicexample: I18n.t("js.composer.italic_text"),
+
+      link: I18n.t("js.composer.link_title") + " <a> Ctrl+L",
+      linkdescription: "enter link description here",
+      linkdialog: "<p><b>" + I18n.t("js.composer.link_dialog_title") + "</b></p><p>http://example.com/ \"" +
+          I18n.t("js.composer.link_optional_text") + "\"</p>",
+
+      quote: I18n.t("js.composer.quote_title") + " <blockquote> Ctrl+Q",
+      quoteexample: I18n.t("js.composer.quote_text"),
+
+      code: I18n.t("js.composer.code_title") + " <pre><code> Ctrl+K",
+      codeexample: I18n.t("js.composer.code_text"),
+
+      image: I18n.t("js.composer.image_title") + " <img> Ctrl+G",
+      imagedescription: I18n.t("js.composer.image_description"),
+      imagedialog: "<p><b>" + I18n.t("js.composer.image_dialog_title") + "</b></p><p>http://example.com/images/diagram.jpg \"" +
+          I18n.t("js.composer.image_optional_text") + "\"<br><br>" + I18n.t("js.composer.image_hosting_hint") + "</p>",
+
+      olist: I18n.t("js.composer.olist_title") + " <ol> Ctrl+O",
+      ulist: I18n.t("js.composer.ulist_title") + " <ul> Ctrl+U",
+      litem: I18n.t("js.compser.list_item"),
+
+      heading: I18n.t("js.composer.heading_title") + " <h1>/<h2> Ctrl+H",
+      headingexample: I18n.t("js.composer.heading_text"),
+
+      hr: I18n.t("js.composer_hr_title") + " <hr> Ctrl+R",
+
+      undo: I18n.t("js.composer.undo_title") + " - Ctrl+Z",
+      redo: I18n.t("js.composer.redo_title") + " - Ctrl+Y",
+      redomac: I18n.t("js.composer.redo_title") + " - Ctrl+Shift+Z",
+
+      help: I18n.t("js.composer.help")
+    };
+
+    return new Markdown.Editor(markdownConverter, idPostfix, options);
+  },
+
+  /**
+    Creates a Markdown.Converter that we we can use for formatting
+
+    @method markdownConverter
+    @param {Object} opts the converting options
+  **/
+  markdownConverter: function(opts) {
+    var converter, mentionLookup,
+      _this = this;
+    converter = new Markdown.Converter();
+    if (opts) {
+      mentionLookup = opts.mentionLookup;
+    }
+    mentionLookup = mentionLookup || Discourse.Mention.lookupCache;
+
+    // Before cooking callbacks
+    converter.hooks.chain("preConversion", function(text) {
+      _this.trigger('beforeCook', {
+        detail: text,
+        opts: opts
+      });
+      return _this.textResult || text;
+    });
+
+    // Support autolinking of www.something.com
+    converter.hooks.chain("preConversion", function(text) {
+      return text.replace(/(^|[\s\n])(www\.[a-z\.\-\_\(\)\/\?\=\%0-9]+)/gim, function(full, _, rest) {
+        return " <a href=\"http://" + rest + "\">" + rest + "</a>";
+      });
+    });
+
+    // newline prediction in trivial cases
+    if (!Discourse.SiteSettings.traditional_markdown_linebreaks) {
+      converter.hooks.chain("preConversion", function(text) {
+        return text.replace(/(^[\w<][^\n]*\n+)/gim, function(t) {
+          if (t.match(/\n{2}/gim)) {
+            return t;
+          }
+          return t.replace("\n", "  \n");
+        });
+      });
+    }
+
+    // github style fenced code
+    converter.hooks.chain("preConversion", function(text) {
+      return text.replace(/^`{3}(?:(.*$)\n)?([\s\S]*?)^`{3}/gm, function(wholeMatch, m1, m2) {
+        var escaped;
+        escaped = Handlebars.Utils.escapeExpression(m2);
+        return "<pre><code class='" + (m1 || 'lang-auto') + "'>" + escaped + "</code></pre>";
+      });
+    });
+
+    converter.hooks.chain("postConversion", function(text) {
+      if (!text) return "";
+
+      // don't to mention voodoo in pres
+      text = text.replace(/<pre>([\s\S]*@[\s\S]*)<\/pre>/gi, function(wholeMatch, inner) {
+        return "<pre>" + (inner.replace(/@/g, '&#64;')) + "</pre>";
+      });
+
+      // Add @mentions of names
+      text = text.replace(/([\s\t>,:'|";\]])(@[A-Za-z0-9_-|\.]*[A-Za-z0-9_-|]+)(?=[\s\t<\!:|;',"\?\.])/g, function(x, pre, name) {
+        if (mentionLookup(name.substr(1))) {
+          return "" + pre + "<a href='/users/" + (name.substr(1).toLowerCase()) + "' class='mention'>" + name + "</a>";
+        } else {
+          return "" + pre + "<span class='mention'>" + name + "</span>";
+        }
+      });
+
+      // a primitive attempt at oneboxing, this regex gives me much eye sores
+      text = text.replace(/(<li>)?((<p>|<br>)[\s\n\r]*)(<a href=["]([^"]+)[^>]*)>([^<]+<\/a>[\s\n\r]*(?=<\/p>|<br>))/gi, function() {
+        // We don't onebox items in a list
+        var onebox, url;
+        if (arguments[1]) {
+          return arguments[0];
+        }
+        url = arguments[5];
+        if (Discourse && Discourse.Onebox) {
+          onebox = Discourse.Onebox.lookupCache(url);
+        }
+        if (onebox && !onebox.isBlank()) {
+          return arguments[2] + onebox;
+        } else {
+          return arguments[2] + arguments[4] + " class=\"onebox\" target=\"_blank\">" + arguments[6];
+        }
+      });
+
+      return(text);
+    });
+
+    converter.hooks.chain("postConversion", function(text) {
+      return Discourse.BBCode.format(text, opts);
+    });
+
+    if (opts.sanitize) {
+      converter.hooks.chain("postConversion", function(text) {
+        if (!window.sanitizeHtml) {
+          return "";
+        }
+        return sanitizeHtml(text);
+      });
+    }
+    return converter;
+  }
+
+};
+RSVP.EventTarget.mixin(Discourse.Markdown);
diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js
index 2712d1027..478bd1d29 100644
--- a/app/assets/javascripts/discourse/components/utilities.js
+++ b/app/assets/javascripts/discourse/components/utilities.js
@@ -1,5 +1,3 @@
-/*global sanitizeHtml:true Markdown:true */
-
 /**
   General utility functions
 
@@ -148,119 +146,6 @@ Discourse.Utilities = {
       range.moveStart('character', pos);
       return range.select();
     }
-  },
-
-  markdownConverter: function(opts) {
-    var converter, mentionLookup,
-      _this = this;
-    converter = new Markdown.Converter();
-    if (opts) {
-      mentionLookup = opts.mentionLookup;
-    }
-    mentionLookup = mentionLookup || Discourse.Mention.lookupCache;
-
-    // Before cooking callbacks
-    converter.hooks.chain("preConversion", function(text) {
-      _this.trigger('beforeCook', {
-        detail: text,
-        opts: opts
-      });
-      return _this.textResult || text;
-    });
-
-    // Support autolinking of www.something.com
-    converter.hooks.chain("preConversion", function(text) {
-      return text.replace(/(^|[\s\n])(www\.[a-z\.\-\_\(\)\/\?\=\%0-9]+)/gim, function(full, _, rest) {
-        return " <a href=\"http://" + rest + "\">" + rest + "</a>";
-      });
-    });
-
-    // newline prediction in trivial cases
-    if (!Discourse.SiteSettings.traditional_markdown_linebreaks) {
-      converter.hooks.chain("preConversion", function(text) {
-        return text.replace(/(^[\w<][^\n]*\n+)/gim, function(t) {
-          if (t.match(/\n{2}/gim)) {
-            return t;
-          }
-          return t.replace("\n", "  \n");
-        });
-      });
-    }
-
-    // github style fenced code
-    converter.hooks.chain("preConversion", function(text) {
-      return text.replace(/^`{3}(?:(.*$)\n)?([\s\S]*?)^`{3}/gm, function(wholeMatch, m1, m2) {
-        var escaped;
-        escaped = Handlebars.Utils.escapeExpression(m2);
-        return "<pre><code class='" + (m1 || 'lang-auto') + "'>" + escaped + "</code></pre>";
-      });
-    });
-
-    converter.hooks.chain("postConversion", function(text) {
-      if (!text) return "";
-
-      // don't to mention voodoo in pres
-      text = text.replace(/<pre>([\s\S]*@[\s\S]*)<\/pre>/gi, function(wholeMatch, inner) {
-        return "<pre>" + (inner.replace(/@/g, '&#64;')) + "</pre>";
-      });
-
-      // Add @mentions of names
-      text = text.replace(/([\s\t>,:'|";\]])(@[A-Za-z0-9_-|\.]*[A-Za-z0-9_-|]+)(?=[\s\t<\!:|;',"\?\.])/g, function(x, pre, name) {
-        if (mentionLookup(name.substr(1))) {
-          return "" + pre + "<a href='/users/" + (name.substr(1).toLowerCase()) + "' class='mention'>" + name + "</a>";
-        } else {
-          return "" + pre + "<span class='mention'>" + name + "</span>";
-        }
-      });
-
-      // a primitive attempt at oneboxing, this regex gives me much eye sores
-      text = text.replace(/(<li>)?((<p>|<br>)[\s\n\r]*)(<a href=["]([^"]+)[^>]*)>([^<]+<\/a>[\s\n\r]*(?=<\/p>|<br>))/gi, function() {
-        // We don't onebox items in a list
-        var onebox, url;
-        if (arguments[1]) {
-          return arguments[0];
-        }
-        url = arguments[5];
-        if (Discourse && Discourse.Onebox) {
-          onebox = Discourse.Onebox.lookupCache(url);
-        }
-        if (onebox && !onebox.isBlank()) {
-          return arguments[2] + onebox;
-        } else {
-          return arguments[2] + arguments[4] + " class=\"onebox\" target=\"_blank\">" + arguments[6];
-        }
-      });
-
-      return(text);
-    });
-
-    converter.hooks.chain("postConversion", function(text) {
-      return Discourse.BBCode.format(text, opts);
-    });
-
-    if (opts.sanitize) {
-      converter.hooks.chain("postConversion", function(text) {
-        if (!window.sanitizeHtml) {
-          return "";
-        }
-        return sanitizeHtml(text);
-      });
-    }
-    return converter;
-  },
-
-  // Takes raw input and cooks it to display nicely (mostly markdown)
-  cook: function(raw, opts) {
-    if (!opts) opts = {};
-
-    // Make sure we've got a string
-    if (!raw) return "";
-
-    if (raw.length === 0) return "";
-
-    this.converter = this.markdownConverter(opts);
-    return this.converter.makeHtml(raw);
   }
-};
 
-RSVP.EventTarget.mixin(Discourse.Utilities);
+};
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js
index 3ec36729e..ee43c3d3b 100644
--- a/app/assets/javascripts/discourse/views/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer_view.js
@@ -251,7 +251,7 @@ Discourse.ComposerView = Discourse.View.extend({
     });
 
     topic = this.get('topic');
-    this.editor = editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({
+    this.editor = editor = Discourse.Markdown.createNewMarkdownEditor(Discourse.Markdown.markdownConverter({
       lookupAvatar: function(username) {
         return Discourse.Utilities.avatarImg({
           username: username,
diff --git a/app/assets/javascripts/discourse/views/pagedown_editor.js b/app/assets/javascripts/discourse/views/pagedown_editor.js
index 868e6decc..50086d1a6 100644
--- a/app/assets/javascripts/discourse/views/pagedown_editor.js
+++ b/app/assets/javascripts/discourse/views/pagedown_editor.js
@@ -34,7 +34,7 @@ Discourse.PagedownEditor = Ember.ContainerView.extend({
     var $wmdInput;
     $wmdInput = $('#wmd-input');
     $wmdInput.data('init', true);
-    this.editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({
+    this.editor = Discourse.Markdown.createNewMarkdownEditor(Discourse.Markdown.markdownConverter({
       sanitize: true
     }));
     return this.editor.run();
diff --git a/app/assets/javascripts/pagedown_custom.js b/app/assets/javascripts/pagedown_custom.js
index e5a3bb7c6..e60999eba 100644
--- a/app/assets/javascripts/pagedown_custom.js
+++ b/app/assets/javascripts/pagedown_custom.js
@@ -1,18 +1,14 @@
-  window.PagedownCustom = {
-    insertButtons: [
-      {
-        id: 'wmd-quote-post',
-        description: 'Quote Post',
-        execute: function() {
-          /* AWFUL but I can't figure out how to call a controller method from outside
-          */
+/*global Markdown:true*/
 
-          /* my app?
-          */
-          return Discourse.__container__.lookup('controller:composer').importQuote();
-        }
+window.PagedownCustom = {
+  insertButtons: [
+    {
+      id: 'wmd-quote-post',
+      description: I18n.t("js.composer.quote_title"),
+      execute: function() {
+        // AWFUL but I can't figure out how to call a controller method from outside our app
+        return Discourse.__container__.lookup('controller:composer').importQuote();
       }
-    ]
-  };
-
-
+    }
+  ]
+};
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d36c7d7ab..d569325b4 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -92,6 +92,7 @@ module PrettyText
 
     @ctx.load(app_root + "app/assets/javascripts/discourse/components/bbcode.js")
     @ctx.load(app_root + "app/assets/javascripts/discourse/components/utilities.js")
+    @ctx.load(app_root + "app/assets/javascripts/discourse/components/markdown.js")
 
     # Load server side javascripts
     if DiscoursePluginRegistry.server_side_javascripts.present?
@@ -123,7 +124,7 @@ module PrettyText
       v8['raw'] = text
       v8.eval('opts["mentionLookup"] = function(u){return helpers.is_username_valid(u);}')
       v8.eval('opts["lookupAvatar"] = function(p){return Discourse.Utilities.avatarImg({username: p, size: "tiny", avatarTemplate: helpers.avatar_template(p)});}')
-      baked = v8.eval('Discourse.Utilities.markdownConverter(opts).makeHtml(raw)')
+      baked = v8.eval('Discourse.Markdown.markdownConverter(opts).makeHtml(raw)')
     end
 
     # we need some minimal server side stuff, apply CDN and TODO filter disallowed markup
diff --git a/spec/javascripts/components/markdown_spec.js b/spec/javascripts/components/markdown_spec.js
new file mode 100644
index 000000000..6cbdcb535
--- /dev/null
+++ b/spec/javascripts/components/markdown_spec.js
@@ -0,0 +1,124 @@
+/*global waitsFor:true expect:true describe:true beforeEach:true it:true */
+
+describe("Discourse.Markdown", function() {
+
+  describe("Cooking", function() {
+
+    var cook = function(contents, opts) {
+      opts = opts || {};
+      opts.mentionLookup = opts.mentionLookup || false;
+      return Discourse.Markdown.cook(contents, opts);
+    };
+
+    it("surrounds text with paragraphs", function() {
+      expect(cook("hello")).toBe("<p>hello</p>");
+    });
+
+    it("automatically handles trivial newlines", function() {
+      expect(cook("1\n2\n3")).toBe("<p>1 <br>\n2 <br>\n3</p>");
+    });
+
+    it("handles quotes properly", function() {
+      var cooked = cook("1[quote=\"bob, post:1\"]my quote[/quote]2", {
+        topicId: 2,
+        lookupAvatar: function(name) { return "" + name; }
+      });
+      expect(cooked).toBe("<p>1</p><aside class='quote' data-post=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n" +
+                          "  bob\n  bob\n  said:\n  </div>\n  <blockquote>my quote</blockquote>\n</aside>\n<p>2</p>");
+    });
+
+    it("includes no avatar if none is found", function() {
+      var cooked = cook("1[quote=\"bob, post:1\"]my quote[/quote]2", {
+        topicId: 2,
+        lookupAvatar: function(name) { return null; }
+      });
+      expect(cooked).toBe("<p>1</p><aside class='quote' data-post=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n" +
+                          "  \n  bob\n  said:\n  </div>\n  <blockquote>my quote</blockquote>\n</aside>\n<p>2</p>");
+    });
+
+    describe("Links", function() {
+
+      it("allows links to contain query params", function() {
+        expect(cook("Youtube: http://www.youtube.com/watch?v=1MrpeBRkM5A")).
+          toBe('<p>Youtube: <a href="http://www.youtube.com/watch?v=1MrpeBRkM5A">http://www.youtube.com/watch?v=1MrpeBRkM5A</a></p>');
+      });
+
+      it("escapes double underscores in URLs", function() {
+        expect(cook("Derpy: http://derp.com?__test=1")).toBe('<p>Derpy: <a href="http://derp.com?%5F%5Ftest=1">http://derp.com?__test=1</a></p>');
+      });
+
+      it("autolinks something that begins with www", function() {
+        expect(cook("Atwood: www.codinghorror.com")).toBe('<p>Atwood: <a href="http://www.codinghorror.com">www.codinghorror.com</a></p>');
+      });
+
+      it("autolinks a URL with http://www", function() {
+        expect(cook("Atwood: http://www.codinghorror.com")).toBe('<p>Atwood: <a href="http://www.codinghorror.com">http://www.codinghorror.com</a></p>');
+      });
+
+      it("autolinks a URL", function() {
+        expect(cook("EvilTrout: http://eviltrout.com")).toBe('<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>');
+      });
+
+      it("supports markdown style links", function() {
+        expect(cook("here is [an example](http://twitter.com)")).toBe('<p>here is <a href="http://twitter.com">an example</a></p>');
+      });
+
+      it("autolinks a URL with parentheses (like Wikipedia)", function() {
+        expect(cook("Batman: http://en.wikipedia.org/wiki/The_Dark_Knight_(film)")).
+          toBe('<p>Batman: <a href="http://en.wikipedia.org/wiki/The_Dark_Knight_(film)">http://en.wikipedia.org/wiki/The_Dark_Knight_(film)</a></p>');
+      });
+
+    });
+
+    describe("Mentioning", function() {
+
+      it("translates mentions to links", function() {
+        expect(cook("Hello @sam", { mentionLookup: (function() { return true; }) })).toBe("<p>Hello <a href='/users/sam' class='mention'>@sam</a></p>");
+      });
+
+      it("adds a mention class", function() {
+        expect(cook("Hello @EvilTrout")).toBe("<p>Hello <span class='mention'>@EvilTrout</span></p>");
+      });
+
+      it("won't add mention class to an email address", function() {
+        expect(cook("robin@email.host")).toBe("<p>robin@email.host</p>");
+      });
+
+      it("won't be affected by email addresses that have a number before the @ symbol", function() {
+        expect(cook("hanzo55@yahoo.com")).toBe("<p>hanzo55@yahoo.com</p>");
+      });
+
+      it("supports a @mention at the beginning of a post", function() {
+        expect(cook("@EvilTrout yo")).toBe("<p><span class='mention'>@EvilTrout</span> yo</p>");
+      });
+
+    });
+
+    describe("Oneboxing", function() {
+
+      it("doesn't onebox a link within a list", function() {
+        expect(cook("- http://www.textfiles.com/bbs/MINDVOX/FORUMS/ethics\n\n- http://drupal.org")).not.toMatch(/onebox/);
+      });
+
+      it("adds a onebox class to a link on its own line", function() {
+        expect(cook("http://test.com")).toMatch(/onebox/);
+      });
+
+      it("supports multiple links", function() {
+        expect(cook("http://test.com\nhttp://test2.com")).toMatch(/onebox[\s\S]+onebox/m);
+      });
+
+      it("doesn't onebox links that have trailing text", function() {
+        expect(cook("http://test.com bob")).not.toMatch(/onebox/);
+      });
+
+      it("works with links that have underscores in them", function() {
+        expect(cook("http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street")).
+          toBe("<p><a href=\"http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street\" class=\"onebox\" target=\"_blank\">http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street</a></p>");
+      });
+
+    });
+
+  });
+
+});
\ No newline at end of file
diff --git a/spec/javascripts/components/utilities_spec.js b/spec/javascripts/components/utilities_spec.js
index 4c53a05e3..a89a39d83 100644
--- a/spec/javascripts/components/utilities_spec.js
+++ b/spec/javascripts/components/utilities_spec.js
@@ -18,125 +18,6 @@ describe("Discourse.Utilities", function() {
 
   });
 
-  describe("Cooking", function() {
-
-    var cook = function(contents, opts) {
-      opts = opts || {};
-      opts.mentionLookup = opts.mentionLookup || false;
-      return Discourse.Utilities.cook(contents, opts);
-    };
-
-    it("surrounds text with paragraphs", function() {
-      expect(cook("hello")).toBe("<p>hello</p>");
-    });
-
-    it("automatically handles trivial newlines", function() {
-      expect(cook("1\n2\n3")).toBe("<p>1 <br>\n2 <br>\n3</p>");
-    });
-
-    it("handles quotes properly", function() {
-      var cooked = cook("1[quote=\"bob, post:1\"]my quote[/quote]2", {
-        topicId: 2,
-        lookupAvatar: function(name) { return "" + name; }
-      });
-      expect(cooked).toBe("<p>1</p><aside class='quote' data-post=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n" +
-                          "  bob\n  bob\n  said:\n  </div>\n  <blockquote>my quote</blockquote>\n</aside>\n<p>2</p>");
-    });
-
-    it("includes no avatar if none is found", function() {
-      var cooked = cook("1[quote=\"bob, post:1\"]my quote[/quote]2", {
-        topicId: 2,
-        lookupAvatar: function(name) { return null; }
-      });
-      expect(cooked).toBe("<p>1</p><aside class='quote' data-post=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n" +
-                          "  \n  bob\n  said:\n  </div>\n  <blockquote>my quote</blockquote>\n</aside>\n<p>2</p>");
-    });
-
-    describe("Links", function() {
-
-      it("allows links to contain query params", function() {
-        expect(cook("Youtube: http://www.youtube.com/watch?v=1MrpeBRkM5A")).
-          toBe('<p>Youtube: <a href="http://www.youtube.com/watch?v=1MrpeBRkM5A">http://www.youtube.com/watch?v=1MrpeBRkM5A</a></p>');
-      });
-
-      it("escapes double underscores in URLs", function() {
-        expect(cook("Derpy: http://derp.com?__test=1")).toBe('<p>Derpy: <a href="http://derp.com?%5F%5Ftest=1">http://derp.com?__test=1</a></p>');
-      });
-
-      it("autolinks something that begins with www", function() {
-        expect(cook("Atwood: www.codinghorror.com")).toBe('<p>Atwood: <a href="http://www.codinghorror.com">www.codinghorror.com</a></p>');
-      });
-
-      it("autolinks a URL with http://www", function() {
-        expect(cook("Atwood: http://www.codinghorror.com")).toBe('<p>Atwood: <a href="http://www.codinghorror.com">http://www.codinghorror.com</a></p>');
-      });
-
-      it("autolinks a URL", function() {
-        expect(cook("EvilTrout: http://eviltrout.com")).toBe('<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>');
-      });
-
-      it("supports markdown style links", function() {
-        expect(cook("here is [an example](http://twitter.com)")).toBe('<p>here is <a href="http://twitter.com">an example</a></p>');
-      });
-
-      it("autolinks a URL with parentheses (like Wikipedia)", function() {
-        expect(cook("Batman: http://en.wikipedia.org/wiki/The_Dark_Knight_(film)")).
-          toBe('<p>Batman: <a href="http://en.wikipedia.org/wiki/The_Dark_Knight_(film)">http://en.wikipedia.org/wiki/The_Dark_Knight_(film)</a></p>');
-      });
-
-    });
-
-    describe("Mentioning", function() {
-
-      it("translates mentions to links", function() {
-        expect(cook("Hello @sam", { mentionLookup: (function() { return true; }) })).toBe("<p>Hello <a href='/users/sam' class='mention'>@sam</a></p>");
-      });
-
-      it("adds a mention class", function() {
-        expect(cook("Hello @EvilTrout")).toBe("<p>Hello <span class='mention'>@EvilTrout</span></p>");
-      });
-
-      it("won't add mention class to an email address", function() {
-        expect(cook("robin@email.host")).toBe("<p>robin@email.host</p>");
-      });
-
-      it("won't be affected by email addresses that have a number before the @ symbol", function() {
-        expect(cook("hanzo55@yahoo.com")).toBe("<p>hanzo55@yahoo.com</p>");
-      });
-
-      it("supports a @mention at the beginning of a post", function() {
-        expect(cook("@EvilTrout yo")).toBe("<p><span class='mention'>@EvilTrout</span> yo</p>");
-      });
-
-    });
-
-    describe("Oneboxing", function() {
-
-      it("doesn't onebox a link within a list", function() {
-        expect(cook("- http://www.textfiles.com/bbs/MINDVOX/FORUMS/ethics\n\n- http://drupal.org")).not.toMatch(/onebox/);
-      });
-
-      it("adds a onebox class to a link on its own line", function() {
-        expect(cook("http://test.com")).toMatch(/onebox/);
-      });
-
-      it("supports multiple links", function() {
-        expect(cook("http://test.com\nhttp://test2.com")).toMatch(/onebox[\s\S]+onebox/m);
-      });
-
-      it("doesn't onebox links that have trailing text", function() {
-        expect(cook("http://test.com bob")).not.toMatch(/onebox/);
-      });
-
-      it("works with links that have underscores in them", function() {
-        expect(cook("http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street")).
-          toBe("<p><a href=\"http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street\" class=\"onebox\" target=\"_blank\">http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street</a></p>");
-      });
-
-    });
-
-  });
-
   describe("emailValid", function() {
 
     it("allows upper case in first part of emails", function() {
diff --git a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
index 81176dd3b..b2cb83f65 100644
--- a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
+++ b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
@@ -3,7 +3,7 @@
   var emoji = ["+1","-1","100","109","1234","8ball","a","ab","abc","abcd","accept","aerial_tramway","airplane","alarm_clock","alien","ambulance","anchor","angel","anger","angry","ant","apple","aquarius","aries","arrow_backward","arrow_double_down","arrow_double_up","arrow_down","arrow_down_small","arrow_forward","arrow_heading_down","arrow_heading_up","arrow_left","arrow_lower_left","arrow_lower_right","arrow_right","arrow_right_hook","arrow_up","arrow_up_down","arrow_up_small","arrow_upper_left","arrow_upper_right","arrows_clockwise","arrows_counterclockwise","art","articulated_lorry","astonished","atm","b","baby","baby_bottle","baby_chick","baby_symbol","baggage_claim","balloon","ballot_box_with_check","bamboo","banana","bangbang","bank","bar_chart","barber","baseball","basketball","bath","bathtub","battery","bear","bee","beer","beers","beetle","beginner","bell","bento","bicyclist","bike","bikini","bird","birthday","black_circle","black_joker","black_nib","black_square","blossom","blowfish","blue_book","blue_car","blue_heart","blush","boar","boat","bomb","book","bookmark","bookmark_tabs","books","boom","boot","bouquet","bow","bowling","bowtie","boy","bread","bride_with_veil","bridge_at_night","briefcase","broken_heart","bug","bulb","bullettrain_front","bullettrain_side","bus","busstop","bust_in_silhouette","busts_in_silhouette","cactus","cake","calendar","calling","camel","camera","cancer","candy","capital_abcd","capricorn","car","card_index","carousel_horse","cat","cat2","cd","chart","chart_with_downwards_trend","chart_with_upwards_trend","checkered_flag","cherries","cherry_blossom","chestnut","chicken","children_crossing","chocolate_bar","christmas_tree","church","cinema","circus_tent","city_sunrise","city_sunset","cl","clap","clapper","clipboard","clock1","clock10","clock1030","clock11","clock1130","clock12","clock1230","clock130","clock2","clock230","clock3","clock330","clock4","clock430","clock5","clock530","clock6","clock630","clock7","clock730","clock8","clock830","clock9","clock930","closed_book","closed_lock_with_key","closed_umbrella","cloud","clubs","cn","cocktail","coffee","cold_sweat","collision","computer","confetti_ball","confounded","congratulations","construction","construction_worker","convenience_store","cookie","cool","cop","copyright","corn","couple","couple_with_heart","couplekiss","cow","cow2","credit_card","crocodile","crossed_flags","crown","cry","crying_cat_face","crystal_ball","cupid","curly_loop","currency_exchange","curry","custard","customs","cyclone","dancer","dancers","dango","dart","dash","date","de","deciduous_tree","department_store","diamond_shape_with_a_dot_inside","diamonds","disappointed","dizzy","dizzy_face","do_not_litter","dog","dog2","dollar","dolls","dolphin","door","doughnut","dragon","dragon_face","dress","dromedary_camel","droplet","dvd","e-mail","ear","ear_of_rice","earth_africa","earth_americas","earth_asia","egg","eggplant","eight","eight_pointed_black_star","eight_spoked_asterisk","electric_plug","elephant","email","end","envelope","es","euro","european_castle","european_post_office","evergreen_tree","exclamation","eyeglasses","eyes","facepunch","factory","fallen_leaf","family","fast_forward","fax","fearful","feelsgood","feet","ferris_wheel","file_folder","finnadie","fire","fire_engine","fireworks","first_quarter_moon","first_quarter_moon_with_face","fish","fish_cake","fishing_pole_and_fish","fist","five","flags","flashlight","floppy_disk","flower_playing_cards","flushed","foggy","football","fork_and_knife","fountain","four","four_leaf_clover","fr","free","fried_shrimp","fries","frog","fuelpump","full_moon","full_moon_with_face","game_die","gb","gem","gemini","ghost","gift","gift_heart","girl","globe_with_meridians","goat","goberserk","godmode","golf","grapes","green_apple","green_book","green_heart","grey_exclamation","grey_question","grin","guardsman","guitar","gun","haircut","hamburger","hammer","hamster","hand","handbag","hankey","hash","hatched_chick","hatching_chick","headphones","hear_no_evil","heart","heart_decoration","heart_eyes","heart_eyes_cat","heartbeat","heartpulse","hearts","heavy_check_mark","heavy_division_sign","heavy_dollar_sign","heavy_exclamation_mark","heavy_minus_sign","heavy_multiplication_x","heavy_plus_sign","helicopter","herb","hibiscus","high_brightness","high_heel","hocho","honey_pot","honeybee","horse","horse_racing","hospital","hotel","hotsprings","hourglass","house","hurtrealbad","ice_cream","icecream","id","ideograph_advantage","imp","inbox_tray","incoming_envelope","information_desk_person","information_source","innocent","interrobang","iphone","it","izakaya_lantern","jack_o_lantern","japan","japanese_castle","japanese_goblin","japanese_ogre","jeans","joy","joy_cat","jp","key","keycap_ten","kimono","kiss","kissing_cat","kissing_face","kissing_heart","koala","koko","kr","large_blue_circle","large_blue_diamond","large_orange_diamond","last_quarter_moon","last_quarter_moon_with_face","laughing","leaves","ledger","left_luggage","left_right_arrow","leftwards_arrow_with_hook","lemon","leo","leopard","libra","light_rail","link","lips","lipstick","lock","lock_with_ink_pen","lollipop","loop","loudspeaker","love_hotel","love_letter","low_brightness","m","mag","mag_right","mahjong","mailbox","mailbox_closed","mailbox_with_mail","mailbox_with_no_mail","man","man_with_gua_pi_mao","man_with_turban","mans_shoe","maple_leaf","mask","massage","meat_on_bone","mega","melon","memo","mens","metal","metro","microphone","microscope","milky_way","minibus","minidisc","mobile_phone_off","money_with_wings","moneybag","monkey","monkey_face","monorail","moon","mortar_board","mount_fuji","mountain_bicyclist","mountain_cableway","mountain_railway","mouse","mouse2","movie_camera","moyai","muscle","mushroom","musical_keyboard","musical_note","musical_score","mute","nail_care","name_badge","neckbeard","necktie","negative_squared_cross_mark","neutral_face","new","new_moon","new_moon_with_face","newspaper","ng","nine","no_bell","no_bicycles","no_entry","no_entry_sign","no_good","no_mobile_phones","no_mouth","no_pedestrians","no_smoking","non-potable_water","nose","notebook","notebook_with_decorative_cover","notes","nut_and_bolt","o","o2","ocean","octocat","octopus","oden","office","ok","ok_hand","ok_woman","older_man","older_woman","on","oncoming_automobile","oncoming_bus","oncoming_police_car","oncoming_taxi","one","open_file_folder","open_hands","ophiuchus","orange_book","outbox_tray","ox","page_facing_up","page_with_curl","pager","palm_tree","panda_face","paperclip","parking","part_alternation_mark","partly_sunny","passport_control","paw_prints","peach","pear","pencil","pencil2","penguin","pensive","performing_arts","persevere","person_frowning","person_with_blond_hair","person_with_pouting_face","phone","pig","pig2","pig_nose","pill","pineapple","pisces","pizza","point_down","point_left","point_right","point_up","point_up_2","police_car","poodle","poop","post_office","postal_horn","postbox","potable_water","pouch","poultry_leg","pound","pouting_cat","pray","princess","punch","purple_heart","purse","pushpin","put_litter_in_its_place","question","rabbit","rabbit2","racehorse","radio","radio_button","rage","rage1","rage2","rage3","rage4","railway_car","rainbow","raised_hand","raised_hands","ram","ramen","rat","recycle","red_car","red_circle","registered","relaxed","relieved","repeat","repeat_one","restroom","revolving_hearts","rewind","ribbon","rice","rice_ball","rice_cracker","rice_scene","ring","rocket","roller_coaster","rooster","rose","rotating_light","round_pushpin","rowboat","ru","rugby_football","runner","running","running_shirt_with_sash","sa","sagittarius","sailboat","sake","sandal","santa","satellite","satisfied","saxophone","school","school_satchel","scissors","scorpius","scream","scream_cat","scroll","seat","secret","see_no_evil","seedling","seven","shaved_ice","sheep","shell","ship","shipit","shirt","shit","shoe","shower","signal_strength","six","six_pointed_star","ski","skull","sleepy","slot_machine","small_blue_diamond","small_orange_diamond","small_red_triangle","small_red_triangle_down","smile","smile_cat","smiley","smiley_cat","smiling_imp","smirk","smirk_cat","smoking","snail","snake","snowboarder","snowflake","snowman","sob","soccer","soon","sos","sound","space_invader","spades","spaghetti","sparkler","sparkles","speak_no_evil","speaker","speech_balloon","speedboat","squirrel","star","star2","stars","station","statue_of_liberty","steam_locomotive","stew","straight_ruler","strawberry","sun_with_face","sunflower","sunglasses","sunny","sunrise","sunrise_over_mountains","surfer","sushi","suspect","suspension_railway","sweat","sweat_drops","sweat_smile","sweet_potato","swimmer","symbols","syringe","tada","tanabata_tree","tangerine","taurus","taxi","tea","telephone","telephone_receiver","telescope","tennis","tent","thought_balloon","three","thumbsdown","thumbsup","ticket","tiger","tiger2","tired_face","tm","toilet","tokyo_tower","tomato","tongue","tongue2","top","tophat","tractor","traffic_light","train","train2","tram","triangular_flag_on_post","triangular_ruler","trident","triumph","trolleybus","trollface","trophy","tropical_drink","tropical_fish","truck","trumpet","tshirt","tulip","turtle","tv","twisted_rightwards_arrows","two","two_hearts","two_men_holding_hands","two_women_holding_hands","u5272","u5408","u55b6","u6307","u6708","u6709","u6e80","u7121","u7533","u7981","u7a7a","uk","umbrella","unamused","underage","unlock","up","us","v","vertical_traffic_light","vhs","vibration_mode","video_camera","video_game","violin","virgo","volcano","vs","walking","waning_crescent_moon","waning_gibbous_moon","warning","watch","water_buffalo","watermelon","wave","wavy_dash","waxing_crescent_moon","waxing_gibbous_moon","wc","weary","wedding","whale","whale2","wheelchair","white_circle","white_flower","white_square","wind_chime","wine_glass","wink","wink2","wolf","woman","womans_clothes","womans_hat","womens","wrench","x","yellow_heart","yen","yum","zap","zero","zzz"]
 
   // Regiest a before cook event
-  Discourse.Utilities.on("beforeCook", function(event) {
+  Discourse.Markdown.on("beforeCook", function(event) {
     var text = event.detail;
     var opts = event.opts;