Merge pull request #253 from examan/master

skip parsing style and script tag

Author: gregjacobs

src/Autolinker.js

@@ -605,19 +605,19 @@ Autolinker.prototype = {
 		    matches = [];
 
 		// Find all matches within the `textOrHtml` (but not matches that are
-		// already nested within <a> tags)
+		// already nested within <a>, <style> and <script> tags)
 		for( var i = 0, len = htmlNodes.length; i < len; i++ ) {
 			var node = htmlNodes[ i ],
 			    nodeType = node.getType();
 
-			if( nodeType === 'element' && node.getTagName() === 'a' ) {  // Process HTML anchor element nodes in the input `textOrHtml` to find out when we're within an <a> tag
-				if( !node.isClosing() ) {  // it's the start <a> tag
+			if( nodeType === 'element' && ['a', 'style', 'script'].indexOf(node.getTagName()) !== -1 ) {  // Process HTML anchor, style and script element nodes in the input `textOrHtml` to find out when we're within an <a>, <style> or <script> tag
+				if( !node.isClosing() ) {  // it's the start <a>, <style> or <script> tag
 					anchorTagStackCount++;
-				} else {  // it's the end </a> tag
+				} else {  // it's the end </a>, </style> or </script> tag
 					anchorTagStackCount = Math.max( anchorTagStackCount - 1, 0 );  // attempt to handle extraneous </a> tags by making sure the stack count never goes below 0
 				}
 
-			} else if( nodeType === 'text' && anchorTagStackCount === 0 ) {  // Process text nodes that are not within an <a> tag
+			} else if( nodeType === 'text' && anchorTagStackCount === 0 ) {  // Process text nodes that are not within an <a>, <style> and <script> tag
 				var textNodeMatches = this.parseText( node.getText(), node.getOffset() );
 
 				matches.push.apply( matches, textNodeMatches );

tests/AutolinkerSpec.js

@@ -1422,6 +1422,18 @@ describe( "Autolinker", function() {
 			} );
 
 
+			it( "should NOT automatically link a URL found within the inner text of a style tag", function() {
+				var result = autolinker.link( 'Testing with <style> .class { background-image: url("http://www.example.com/image.png"); } </style> tags' );
+				expect( result ).toBe( 'Testing with <style> .class { background-image: url("http://www.example.com/image.png"); } </style> tags' );
+			} );
+
+
+			it( "should NOT automatically link a URL found within the inner text of a script tag", function() {
+				var result = autolinker.link( 'Testing with <script> alert("http://google.com"); </script> tags' );
+				expect( result ).toBe( 'Testing with <script> alert("http://google.com"); </script> tags' );
+			} );
+
+
 			it( "should NOT automatically link an image tag with a URL inside of it, when it has another attribute which has extraneous spaces surround its value (Issue #45)", function() {
 				var result = autolinker.link( "Testing <img src='http://terryshoemaker.files.wordpress.com/2013/03/placeholder1.jpg' style=' height: 22px; background-color: rgb(0, 188, 204); border-radius: 7px; padding: 2px; margin: 0px 2px;'>" );
 				expect( result ).toBe( "Testing <img src='http://terryshoemaker.files.wordpress.com/2013/03/placeholder1.jpg' style=' height: 22px; background-color: rgb(0, 188, 204); border-radius: 7px; padding: 2px; margin: 0px 2px;'>" );