From 3b784b50cc74592df2539ed0f6755d0af0fa8d2b Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 1 May 2013 11:16:13 +1000 Subject: [PATCH] correct base url in emoji so I can close bug --- .../vendor/assets/javascripts/discourse_emoji.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 75226075d..cfbc16d45 100644 --- a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js +++ b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js @@ -14,8 +14,9 @@ } this.textResult = text.replace(/\:([a-z\_\+\-0-9]+)\:/g, function (m1, m2) { + var url = Discourse.getURL('/assets/emoji/' + m2 + '.png'); return (emoji.indexOf(m2) !== -1) ? - '' + m2 + '' : + '' + m2 + '' : m1; }); }); @@ -24,12 +25,14 @@ if (Discourse && Discourse.ComposerView) { Discourse.ComposerView.on("initWmdEditor", function(event){ + var baseUrl = Discourse.getURL("/"); + template = Handlebars.compile("
" + "