Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html

Browse Source 
Conflicts:
	lib/liquid/standardfilters.rb
This commit is contained in:
Florian Weingarten
2013-06-18 04:04:49 +02:00
parent 9c9a7ce8d3 4a2bbafeb4
commit eca520025c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+1 -2
View File
@@ -65,7 +65,7 @@ module Liquid
end end
def strip_html(input) def strip_html(input)
input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<!--.*?-->/, '').gsub(/<.*?>/, '') input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<.*?>/m, '')
end end
# Remove all newlines from the string # Remove all newlines from the string
@@ -73,7 +73,6 @@ module Liquid
input.to_s.gsub(/\r?\n/, '') input.to_s.gsub(/\r?\n/, '')
end end
# Join elements of the array with certain character between them # Join elements of the array with certain character between them
def join(input, glue = ' ') def join(input, glue = ' ')
[input].flatten.join(glue) [input].flatten.join(glue)
test/liquid/standard_filter_test.rb
+1
View File
@@ -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>test</div>")
assert_equal 'test', @filters.strip_html("<div id='test'>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("<script type='text/javascript'>document.write('some stuff');</script>")
assert_equal 'test', @filters.strip_html("<div\nclass='multiline'>test</div>")
assert_equal '', @filters.strip_html(nil) assert_equal '', @filters.strip_html(nil)
end end