FIX: deduplicate css in mails (#30003)
Feature: Resolve final styles in email notifications Context - https://meta.discourse.org/t/resolve-final-styles-in-email-notifications/310219
This commit is contained in:
parent
35be2a9879
commit
6e726d436f
|
@ -374,12 +374,31 @@ module Email
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def deduplicate_style(style)
|
||||||
|
styles = {}
|
||||||
|
|
||||||
|
style
|
||||||
|
.split(";")
|
||||||
|
.select(&:present?)
|
||||||
|
.map { _1.split(":", 2).map(&:strip) }
|
||||||
|
.each { |k, v| styles[k] = v if k.present? && v.present? }
|
||||||
|
|
||||||
|
styles.map { |k, v| "#{k}:#{v}" }.join(";")
|
||||||
|
end
|
||||||
|
|
||||||
|
def deduplicate_styles
|
||||||
|
@fragment
|
||||||
|
.css("[style]")
|
||||||
|
.each { |element| element["style"] = deduplicate_style element["style"] }
|
||||||
|
end
|
||||||
|
|
||||||
def to_html
|
def to_html
|
||||||
# needs to be before class + id strip because we need to style redacted
|
# needs to be before class + id strip because we need to style redacted
|
||||||
# media and also not double-redact already redacted from lower levels
|
# media and also not double-redact already redacted from lower levels
|
||||||
replace_secure_uploads_urls if SiteSetting.secure_uploads?
|
replace_secure_uploads_urls if SiteSetting.secure_uploads?
|
||||||
strip_classes_and_ids
|
strip_classes_and_ids
|
||||||
replace_relative_urls
|
replace_relative_urls
|
||||||
|
deduplicate_styles
|
||||||
|
|
||||||
@fragment.to_html
|
@fragment.to_html
|
||||||
end
|
end
|
||||||
|
|
|
@ -168,6 +168,24 @@ RSpec.describe Email::Styles do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "deduplicate styles" do
|
||||||
|
it "removes double definitions" do
|
||||||
|
frag = "<test style='color:green;color:red'>hello</test>"
|
||||||
|
styler = Email::Styles.new(frag)
|
||||||
|
styled = styler.to_html
|
||||||
|
styled = Nokogiri::HTML5.fragment(styled)
|
||||||
|
expect(styled.at("test")["style"]).to eq("color:red")
|
||||||
|
end
|
||||||
|
it "handles whitespace correctly" do
|
||||||
|
frag =
|
||||||
|
"<test style=' color : green ; ; ; color : red; background:white; background:yellow '>hello</test>"
|
||||||
|
styler = Email::Styles.new(frag)
|
||||||
|
styled = styler.to_html
|
||||||
|
styled = Nokogiri::HTML5.fragment(styled)
|
||||||
|
expect(styled.at("test")["style"]).to eq("color:red;background:yellow")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "dark mode emails" do
|
describe "dark mode emails" do
|
||||||
it "adds dark_mode_styles when site setting active" do
|
it "adds dark_mode_styles when site setting active" do
|
||||||
frag = html_fragment('<div class="body">test</div>')
|
frag = html_fragment('<div class="body">test</div>')
|
||||||
|
|
Loading…
Reference in New Issue