relocate emoji plugin, stop pre-compiling assets

This commit is contained in:
Sam
2013-11-20 14:38:21 +11:00
parent a468d6cfb0
commit 8278fdb9dd
1748 changed files with 181 additions and 404 deletions

View File

@@ -80,7 +80,13 @@ module PrettyText
# Load server side javascripts
if DiscoursePluginRegistry.server_side_javascripts.present?
DiscoursePluginRegistry.server_side_javascripts.each do |ssjs|
ctx.load(ssjs)
if(ssjs =~ /\.erb/)
erb = ERB.new(File.read(ssjs))
erb.filename = ssjs
ctx.eval(erb.result)
else
ctx.load(ssjs)
end
end
end
@@ -167,8 +173,8 @@ module PrettyText
def self.add_rel_nofollow_to_user_content(html)
whitelist = []
l = SiteSetting.exclude_rel_nofollow_domains
whitelist = l.split(",") if l.present?
domains = SiteSetting.exclude_rel_nofollow_domains
whitelist = domains.split(",") if domains.present?
site_uri = nil
doc = Nokogiri::HTML.fragment(html)