codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-16 03:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: When emoji was disabled you could get a JS error in preview

Browse source
This commit is contained in:
Robin Ward 2014-09-17 12:57:49 -04:00
parent 4487d6a4c2
commit d472b4e10a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/emoji/assets/javascripts/emoji.js.erb
View file

@ -54,7 +54,7 @@
} else { } else {
var replacement = translations[t]; var replacement = translations[t];
Discourse.Dialect.inlineReplace(t, function (token, match, prev) { Discourse.Dialect.inlineReplace(t, function (token, match, prev) {
if (!Discourse.SiteSettings.enable_emoji) { return; } if (!Discourse.SiteSettings.enable_emoji) { return token; }
return checkPrev(prev) ? imageFor(replacement) : token; return checkPrev(prev) ? imageFor(replacement) : token;
}); });
} }