IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

correct base url in emoji so I can close bug

Browse Source
This commit is contained in:
Sam 2013-05-01 11:16:13 +10:00
parent e5c5c0bbb3
commit 3b784b50cc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js vendored
View File

@ -14,8 +14,9 @@
} }
this.textResult = text.replace(/\:([a-z\_\+\-0-9]+)\:/g, function (m1, m2) { 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) ? return (emoji.indexOf(m2) !== -1) ?
'<img alt="' + m2 + '" title=":' + m2 + ':" src="/assets/emoji/' + m2 + '.png" ' + style + ' class="emoji"/>' : '<img alt="' + m2 + '" title=":' + m2 + ':" src="' + url + '" ' + style + ' class="emoji"/>' :
m1; m1;
}); });
}); });
@ -24,12 +25,14 @@
if (Discourse && Discourse.ComposerView) { if (Discourse && Discourse.ComposerView) {
Discourse.ComposerView.on("initWmdEditor", function(event){ Discourse.ComposerView.on("initWmdEditor", function(event){
var baseUrl = Discourse.getURL("/");
template = Handlebars.compile("<div class='autocomplete'>" + template = Handlebars.compile("<div class='autocomplete'>" +
"<ul>" + "<ul>" +
"{{#each options}}" + "{{#each options}}" +
"<li>" + "<li>" +
"<a href='#'>" + "<a href='#'>" +
"<img src='/assets/emoji/{{this}}.png' class='emoji'> " + "<img src='" + baseUrl + "assets/emoji/{{this}}.png' class='emoji'> " +
"{{this}}</a>" + "{{this}}</a>" +
"</li>" + "</li>" +
"{{/each}}" + "{{/each}}" +
@ -44,7 +47,7 @@
term = term.toLowerCase(); term = term.toLowerCase();
if (term == "") { if (term === "") {
return Ember.Deferred.promise(function (promise) { return Ember.Deferred.promise(function (promise) {
promise.resolve(["smile", "smiley", "wink", "sunny", "blush"]); promise.resolve(["smile", "smiley", "wink", "sunny", "blush"]);
}); });
@ -53,7 +56,7 @@
var options = [] var options = []
var i; var i;
for (i=0; i < emoji.length; i++) { for (i=0; i < emoji.length; i++) {
if (emoji[i].indexOf(term) == 0) { if (emoji[i].indexOf(term) === 0) {
options.push(emoji[i]); options.push(emoji[i]);
if(options.length > 4) { break; } if(options.length > 4) { break; }
} }