Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3125 from gschlager/bugfix_01 

FIX: Loading of Emoji files depended on working directory
This commit is contained in:
Régis Hanol 2015-01-25 17:42:16 +01:00
parent 20a0a2f60b 361b3fb07a
commit 78a7fb4b07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/emoji.rb
View File

@ -65,7 +65,7 @@ class Emoji
end end
def self.db_file def self.db_file
"lib/emoji/db.json" "#{Rails.root}/lib/emoji/db.json"
end end
def self.load_standard def self.load_standard

4
lib/pretty_text.rb
View File

@ -75,14 +75,14 @@ module PrettyText
"app/assets/javascripts/discourse/lib/markdown.js" "app/assets/javascripts/discourse/lib/markdown.js"
) )
Dir["#{Rails.root}/app/assets/javascripts/discourse/dialects/**.js"].sort.each do |dialect| Dir["#{app_root}/app/assets/javascripts/discourse/dialects/**.js"].sort.each do |dialect|
unless dialect =~ /\/dialect\.js$/ unless dialect =~ /\/dialect\.js$/
ctx.load(dialect) ctx.load(dialect)
end end
end end
# custom emojis # custom emojis
emoji = ERB.new(File.read("app/assets/javascripts/discourse/lib/emoji/emoji.js.erb")) emoji = ERB.new(File.read("#{app_root}/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb"))
ctx.eval(emoji.result) ctx.eval(emoji.result)
Emoji.custom.each do |emoji| Emoji.custom.each do |emoji|