github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 23:07:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: custom emojis leaking over multisites

Browse Source
This commit is contained in:
Régis Hanol
2016-11-17 19:35:39 +01:00
parent 82bdfb9832
commit a0f1090d79
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
View File

@ -1,5 +1,5 @@
import { registerOption } from 'pretty-text/pretty-text'; import { registerOption } from 'pretty-text/pretty-text';
import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji'; import { registerEmoji, buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji';
import { translations } from 'pretty-text/emoji/data'; import { translations } from 'pretty-text/emoji/data';
let _unicodeReplacements; let _unicodeReplacements;
@ -29,7 +29,7 @@ function checkPrev(prev) {
registerOption((siteSettings, opts, state) => { registerOption((siteSettings, opts, state) => {
opts.features.emoji = !!siteSettings.enable_emoji; opts.features.emoji = !!siteSettings.enable_emoji;
opts.emojiSet = siteSettings.emoji_set || ""; opts.emojiSet = siteSettings.emoji_set || "";
opts.customEmoji = state.customEmoji; _(state.customEmoji).each((url, name) => registerEmoji(name, url));
}); });
export function setup(helper) { export function setup(helper) {

7
lib/pretty_text.rb
View File

@ -56,7 +56,7 @@ module PrettyText
ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
if Rails.env.development? || Rails.env.test? if Rails.env.development? || Rails.env.test?
ctx.attach("console.log", proc{|l| p l }) ctx.attach("console.log", proc { |l| p l })
end end
ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js") ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
@ -154,10 +154,7 @@ module PrettyText
context.eval("__optInput.mentionLookup = __mentionLookup;") context.eval("__optInput.mentionLookup = __mentionLookup;")
custom_emoji = {} custom_emoji = {}
Emoji.custom.map do |e| Emoji.custom.map { |e| custom_emoji[e.name] = e.url }
context.eval("__registerEmoji('#{e.name}', '#{e.url}')")
custom_emoji[e.name] = e.url
end
context.eval("__optInput.customEmoji = #{custom_emoji.to_json};") context.eval("__optInput.customEmoji = #{custom_emoji.to_json};")
context.eval('__textOptions = __buildOptions(__optInput);') context.eval('__textOptions = __buildOptions(__optInput);')

1
lib/pretty_text/shims.js
View File

@ -1,7 +1,6 @@
__PrettyText = require('pretty-text/pretty-text').default; __PrettyText = require('pretty-text/pretty-text').default;
__buildOptions = require('pretty-text/pretty-text').buildOptions; __buildOptions = require('pretty-text/pretty-text').buildOptions;
__performEmojiUnescape = require('pretty-text/emoji').performEmojiUnescape; __performEmojiUnescape = require('pretty-text/emoji').performEmojiUnescape;
__registerEmoji = require('pretty-text/emoji').registerEmoji;
__utils = require('discourse/lib/utilities'); __utils = require('discourse/lib/utilities');
__setUnicode = require('pretty-text/engines/discourse-markdown/emoji').setUnicodeReplacements; __setUnicode = require('pretty-text/engines/discourse-markdown/emoji').setUnicodeReplacements;