Merge #1099

Author: joallard

CHANGELOG.md

@@ -1,3 +1,8 @@
+*  Fix highlighting more than one character (#1099, #1098)
+
+   *@skimi*
+
+
 ## v0.12.2 · 23 June 2016
 *  Fix issue preventing build ("Cannot assign to read only property
    'subarray'") because of bug in uglifyjs. (#1072)

src/contrib/highlight.js

@@ -36,4 +36,17 @@ var highlight = function($element, pattern) {
 	return $element.each(function() {
 		highlight(this);
 	});
-};
+};
+
+/**
+ * removeHighlight fn copied from highlight v5 and
+ * edited to remove with() and pass js strict mode
+ */
+jQuery.fn.removeHighlight = function() {
+	return this.find("span.highlight").each(function() {
+		this.parentNode.firstChild.nodeName;
+		var parent = this.parentNode;
+		parent.replaceChild(this.firstChild, this);
+		parent.normalize();
+	}).end();
+};

src/selectize.js

@@ -1100,6 +1100,7 @@ $.extend(Selectize.prototype, {
 
 		// highlight matching terms inline
 		if (self.settings.highlight && results.query.length && results.tokens.length) {
+			$dropdown_content.removeHighlight();
 			for (i = 0, n = results.tokens.length; i < n; i++) {
 				highlight($dropdown_content, results.tokens[i].regex);
 			}