Merge 66089f0557 into cc6a6f2d9a

12 years ago · 48a5b91712
parent cc6a6f2d9a 66089f0557
commit 48a5b91712
2 changed files with 2 additions and 2 deletions
--- a/sorting/num-html.js
+++ b/sorting/num-html.js
@ -11,7 +11,7 @@
 jQuery.extend( jQuery.fn.dataTableExt.oSort, {
 	"num-html-pre": function ( a ) {
-		var x = a.replace( /<.*?>/g, "" );
+		var x = String(a).replace( /<[\s\S]*?>/g, "" );
 		return parseFloat( x );
 	},
--- a/type-detection/num-html.js
+++ b/type-detection/num-html.js
@ -11,7 +11,7 @@
 jQuery.fn.dataTableExt.aTypes.unshift( function ( sData )
 {
 	sData = typeof sData.replace == 'function' ?
-		sData.replace( /<.*?>/g, "" ) : sData;
+		sData.replace( /<[\s\S]*?>/g, "" ) : sData;
 	sData = $.trim(sData);
 	var sValidFirstChars = "0123456789-";