Merge pull request #1328 from SergioCrisostomo/fix-1022

fix regex to not mix self closing tags

Author: SergioCrisostomo

Docs/Types/String.Extras.md

@@ -137,7 +137,7 @@ Remove all html tags from a string.
 	var noItalics = html.stripTags('i');
 	//returns "<b>This is a string with html in it.</b>"
 	var noItalicsContent = html.stripTags('i', true);
-	returns "<b>This is a string with  in it.</b>"
+	//returns "<b>This is a string with  in it.</b>"
 
 ### Returns
 

Source/Types/String.Extras.js

@@ -95,8 +95,8 @@ var walk = function(string, replacements){
 };
 
 var getRegexForTag = function(tag, contents){
-	tag = tag || '';
-	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "([^>]+)?>";
+	tag = tag || (contents ? '' : '\\w+');
+	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "\/?>|<" + tag + "[\\s|\/][^>]*>";
 	return new RegExp(regstr, "gi");
 };
 

Specs/Types/String.Extras.js

@@ -50,6 +50,14 @@ describe('String.stripTags', function(){
 		expect('i like cookies'.stripTags()).toEqual('i like cookies');
 	});
 
+	it('should leave a string with <b></b> but no <br/>', function(){
+		expect('<b>Header</b><br/>'.stripTags('br')).toEqual('<b>Header</b>');
+	});
+
+	it('should leave a string with <br/> but no <b></b>', function(){
+		expect('<b class="foo">Header</b><br/>'.stripTags('b')).toEqual('Header<br/>');
+	});
+
 });
 
 describe('String.truncate', function(){