Fixes bug affecting values that match "$\d+" (selectize#172).

brianreavis · brianreavis · commit 25425e76152c · 2013-11-03T13:01:52.000-08:00
diff --git a/src/selectize.js b/src/selectize.js
@@ -1802,10 +1802,10 @@ $.extend(Selectize.prototype, {
 		}
 		if (templateName === 'optgroup') {
 			id = data[self.settings.optgroupValueField] || '';
-			html = html.replace(regex_tag, '<$1 data-group="' + escape_html(id) + '"');
+			html = html.replace(regex_tag, '<$1 data-group="' + escape_replace(escape_html(id)) + '"');
 		}
 		if (templateName === 'option' || templateName === 'item') {
-			html = html.replace(regex_tag, '<$1 data-value="' + escape_html(value || '') + '"');
+			html = html.replace(regex_tag, '<$1 data-value="' + escape_replace(escape_html(value || '')) + '"');
 		}
 
 		// update cache
diff --git a/src/utils.js b/src/utils.js
@@ -44,6 +44,16 @@ var escape_html = function(str) {
 		.replace(/"/g, '&quot;');
 };
 
+/**
+ * Escapes "$" characters in replacement strings.
+ *
+ * @param {string} str
+ * @returns {string}
+ */
+var escape_replace = function(str) {
+	return (str + '').replace(/\$/g, '$$$$');
+};
+
 var hook = {};
 
 /**
diff --git a/test/api.js b/test/api.js
@@ -195,6 +195,7 @@
 						{value: 'a'},
 						{value: 'b'},
 						{value: 'c'},
+						{value: '$1'},
 						{value: '\''},
 						{value: '"'},
 						{value: '\\\''},
@@ -231,6 +232,16 @@
 			it('should update DOM', function() {
 				test.selectize.addItem('c');
 				expect(test.selectize.$control.find('[data-value=c]').length).to.be.equal(1);
+
+				test.selectize.addItem('$1');
+				var found = false;
+				test.selectize.$control.children().each(function() {
+					if (this.getAttribute('data-value') === '$1') {
+						found = true;
+						return false;
+					}
+				});
+				expect(found).to.be.equal(true);
 			});
 		});
 

Original file line number	Diff line number	Diff line change
`@@ -1802,10 +1802,10 @@ $.extend(Selectize.prototype, {`
`1802`	`1802`	`}`
`1803`	`1803`	`if (templateName === 'optgroup') {`
`1804`	`1804`	`id = data[self.settings.optgroupValueField] \|\| '';`
`1805`		`- html = html.replace(regex_tag, '<$1 data-group="' + escape_html(id) + '"');`
	`1805`	`+ html = html.replace(regex_tag, '<$1 data-group="' + escape_replace(escape_html(id)) + '"');`
`1806`	`1806`	`}`
`1807`	`1807`	`if (templateName === 'option' \|\| templateName === 'item') {`
`1808`		`- html = html.replace(regex_tag, '<$1 data-value="' + escape_html(value \|\| '') + '"');`
	`1808`	`+ html = html.replace(regex_tag, '<$1 data-value="' + escape_replace(escape_html(value \|\| '')) + '"');`
`1809`	`1809`	`}`
`1810`	`1810`
`1811`	`1811`	`// update cache`