Merge pull request #964 from rdkleine/master

Support for font-style = italic and font-size = [size em/px/%] in sanitize function validStyles
textAngular · Aug 3, 2016 · dde3d7f · dde3d7f
2 parents 526f7a3 + 8b7f6f8
commit dde3d7f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/textAngular-sanitize.js b/src/textAngular-sanitize.js
@@ -535,19 +535,28 @@ function validStyles(styleAttr){
 					|| value === 'justify'
 				)
 			||
-                key === 'text-decoration' && (
-                    value === 'underline'
-                    || value === 'line-through'
-                )
-            || key === 'font-weight' && (
-                    value === 'bold'
-                )
-            ||
+        key === 'text-decoration' && (
+            value === 'underline'
+            || value === 'line-through'
+        )
+      || 
+        key === 'font-weight' && (
+            value === 'bold'
+        )
+      ||
+        key === 'font-style' && (
+          value === 'italic'
+        )
+      ||
 				key === 'float' && (
 					value === 'left'
 					|| value === 'right'
 					|| value === 'none'
 				)
+      ||
+        key === 'font-size' && (
+					value.match(/[0-9\.]*(px|em|rem|%)/)
+				)
 			||
 				(key === 'width' || key === 'height') && (
 					value.match(/[0-9\.]*(px|em|rem|%)/)

diff --git a/test/textAngularSanitize/sanitize.spec.js b/test/textAngularSanitize/sanitize.spec.js
@@ -59,7 +59,13 @@ describe('HTML', function() {
       htmlParser('<!--FOOBAR-->', handler);
       expect(comment).toEqual('FOOBAR');
     });
-
+
+    it('should parse font-style italic', function(){
+      var html = '<span style="font-type:italic">';
+      htmlParser(html, handler);
+      expect(comment).toEqual(html);
+    });
+
     it('should throw an exception for invalid comments', function() {
       var caught=false;
       try {