Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

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

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
if Rails.env.development? || Rails.env.test?
ctx.attach("console.log", proc{|l| p l })
ctx.attach("console.log", proc { |l| p l })
end
ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
@ -154,10 +154,7 @@ module PrettyText
context.eval("__optInput.mentionLookup = __mentionLookup;")
custom_emoji = {}
Emoji.custom.map do |e|
context.eval("__registerEmoji('#{e.name}', '#{e.url}')")
custom_emoji[e.name] = e.url
end
Emoji.custom.map { |e| custom_emoji[e.name] = e.url }
context.eval("__optInput.customEmoji = #{custom_emoji.to_json};")
context.eval('__textOptions = __buildOptions(__optInput);')