Fix highlighting bugs selectize#1149 and selectize#1142 by preventing nested highlight <span>'s

micahjon · micahjon · commit e9da17589e38 · 2016-11-03T21:54:29.000-04:00
diff --git a/src/contrib/highlight.js b/src/contrib/highlight.js
@@ -25,7 +25,7 @@ var highlight = function($element, pattern) {
 				middlebit.parentNode.replaceChild(spannode, middlebit);
 				skip = 1;
 			}
-		} else if (node.nodeType === 1 && node.childNodes && !/(script|style)/i.test(node.tagName)) {
+		} else if (node.nodeType === 1 && node.childNodes && !/(script|style)/i.test(node.tagName) && ( node.className !== 'highlight' || node.tagName !== 'SPAN' )) {
 			for (var i = 0; i < node.childNodes.length; ++i) {
 				i += highlight(node.childNodes[i]);
 			}

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ var highlight = function($element, pattern) {`
`25`	`25`	`middlebit.parentNode.replaceChild(spannode, middlebit);`
`26`	`26`	`skip = 1;`
`27`	`27`	`}`
`28`		`- } else if (node.nodeType === 1 && node.childNodes && !/(script\|style)/i.test(node.tagName)) {`
	`28`	`+ } else if (node.nodeType === 1 && node.childNodes && !/(script\|style)/i.test(node.tagName) && ( node.className !== 'highlight' \|\| node.tagName !== 'SPAN' )) {`
`29`	`29`	`for (var i = 0; i < node.childNodes.length; ++i) {`
`30`	`30`	`i += highlight(node.childNodes[i]);`
`31`	`31`	`}`