mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
relocate emoji plugin, stop pre-compiling assets
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user