FIX: adding a custom emoji needed an application restart to work on t…

…he server-side rendering
discourse · Jan 29, 2015 · 3a24df6 · 3a24df6
1 parent b5a6193
commit 3a24df6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...ts/javascripts/discourse/dialects/html.js → ...cripts/discourse/dialects/html_dialect.js b/...ts/javascripts/discourse/dialects/html.js → ...cripts/discourse/dialects/html_dialect.js
diff --git a/...iscourse/dialects/nested_link_dialects.js → ...discourse/dialects/nested_link_dialect.js b/...iscourse/dialects/nested_link_dialects.js → ...discourse/dialects/nested_link_dialect.js
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
@@ -76,19 +76,13 @@ def self.create_new_context
     )
 
     Dir["#{app_root}/app/assets/javascripts/discourse/dialects/**.js"].sort.each do |dialect|
-      unless dialect =~ /\/dialect\.js$/
-        ctx.load(dialect)
-      end
+      ctx.load(dialect) unless dialect =~ /\/dialect\.js$/
     end
 
-    # custom emojis
+    # emojis
     emoji = ERB.new(File.read("#{app_root}/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|
@@ -102,8 +96,8 @@ def self.create_new_context
       end
     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['quoteTemplate'] = File.read("#{app_root}/app/assets/javascripts/discourse/templates/quote.hbs")
+    ctx['quoteEmailTemplate'] = File.read("#{app_root}/lib/assets/quote_email.hbs")
     ctx.eval("HANDLEBARS_TEMPLATES = {
       'quote': Handlebars.compile(quoteTemplate),
       'quote_email': Handlebars.compile(quoteEmailTemplate),
@@ -160,6 +154,11 @@ def self.markdown(text, opts=nil)
         end
       end
 
+      # custom emojis
+      Emoji.custom.each do |emoji|
+        context.eval("Discourse.Dialect.registerEmoji('#{emoji.name}', '#{emoji.url}');")
+      end
+
       context.eval('opts["mentionLookup"] = function(u){return helpers.is_username_valid(u);}')
       context.eval('opts["lookupAvatar"] = function(p){return Discourse.Utilities.avatarImg({size: "tiny", avatarTemplate: helpers.avatar_template(p)});}')
       baked = context.eval('Discourse.Markdown.markdownConverter(opts).makeHtml(raw)')