mirror of
https://github.com/kemko/liquid.git
synced 2026-01-03 08:45:42 +03:00
Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix
Conflicts: lib/liquid/standardfilters.rb
This commit is contained in:
@@ -65,7 +65,7 @@ module Liquid
|
||||
end
|
||||
|
||||
def strip_html(input)
|
||||
input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<.*?>/m, '')
|
||||
input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<style.*?<\/style>/m, '').gsub(/<.*?>/m, '')
|
||||
end
|
||||
|
||||
# Remove all newlines from the string
|
||||
|
||||
@@ -71,6 +71,7 @@ class StandardFiltersTest < Test::Unit::TestCase
|
||||
assert_equal 'test', @filters.strip_html("<div>test</div>")
|
||||
assert_equal 'test', @filters.strip_html("<div id='test'>test</div>")
|
||||
assert_equal '', @filters.strip_html("<script type='text/javascript'>document.write('some stuff');</script>")
|
||||
assert_equal '', @filters.strip_html("<style type='text/css'>foo bar</style>")
|
||||
assert_equal 'test', @filters.strip_html("<div\nclass='multiline'>test</div>")
|
||||
assert_equal 'test', @filters.strip_html("<!-- foo bar \n test -->test")
|
||||
assert_equal '', @filters.strip_html(nil)
|
||||
|
||||
Reference in New Issue
Block a user