tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HTML validation (#10354)

Browse Source 
* Fix HTML validation

* Report first HTML error instead on validation error
This commit is contained in:
ThibG
2019-03-26 17:33:26 +01:00
committed by Eugen Rochko
parent 6f6abc369f
commit 0c46bd11aa
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/validators/html_validator.rb
View File

@ -3,12 +3,16 @@
class HtmlValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
return if value.blank?
record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value)
errors = html_errors(value)
unless errors.empty?
record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
end
end
private
def valid_html?(str)
Nokogiri::HTML.fragment(str).to_s == str
def html_errors(str)
fragment = Nokogiri::HTML.fragment(str)
fragment.errors
end
end