diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index f937ae80f..f47b54d9f 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -81,6 +81,14 @@ module PrettyText end end + # custom emojis + emoji = ERB.new(File.read("app/assets/javascripts/discourse/lib/emoji/emoji.js.erb")) + ctx.eval(emoji.result) + + Emoji.custom.each do |emoji| + ctx.eval("Discourse.Dialect.registerEmoji('#{emoji.name}', '#{emoji.url}');") + end + # Load server side javascripts if DiscoursePluginRegistry.server_side_javascripts.present? DiscoursePluginRegistry.server_side_javascripts.each do |ssjs| @@ -94,14 +102,6 @@ module PrettyText end end - # custom emojis - emoji = ERB.new(File.read("app/assets/javascripts/discourse/lib/emoji/emoji.js.erb")) - ctx.eval(emoji.result) - - Emoji.custom.each do |emoji| - ctx.eval("Discourse.Dialect.registerEmoji('#{emoji.name}', '#{emoji.url}');") - end - ctx['quoteTemplate'] = File.open(app_root + 'app/assets/javascripts/discourse/templates/quote.hbs') {|f| f.read} ctx['quoteEmailTemplate'] = File.open(app_root + 'lib/assets/quote_email.hbs') {|f| f.read} ctx.eval("HANDLEBARS_TEMPLATES = {