fix(sanitize): Port script/style fix over from main repo.

Fixes #533
textAngular · Feb 3, 2015 · 7975a26 · 7975a26
1 parent da43539
commit 7975a26
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dist/textAngular-sanitize.min.js b/dist/textAngular-sanitize.min.js
diff --git a/src/textAngular-sanitize.js b/src/textAngular-sanitize.js
@@ -341,7 +341,7 @@ function htmlParser(html, handler) {
       }
 
     } else {
-      html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
+      html = html.replace(new RegExp("([^]*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
         function(all, text) {
           text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
 

diff --git a/test/textAngularSanitize/sanitize.spec.js b/test/textAngularSanitize/sanitize.spec.js
@@ -137,7 +137,7 @@ describe('HTML', function() {
   });
 
   it('should remove script', function() {
-    expectHTML('a<SCRIPT>evil< / scrIpt >c.').toEqual('ac.');
+    expectHTML('a<SCRIPT>\n\revil\n\r< / scrIpt >c.').toEqual('ac.');
   });
 
   it('should remove DOCTYPE header', function() {
@@ -157,7 +157,7 @@ describe('HTML', function() {
   });
 
   it('should remove style', function() {
-    expectHTML('a<STyle>evil</stYle>c.').toEqual('ac.');
+    expectHTML('a<STyle>\n\revil\n\r</stYle>c.').toEqual('ac.');
   });
 
   it('should remove script and style', function() {