Merge pull request TryGhost#2496 from halfdan/more-tag-fuddling

Escape regex special characters in tag finder
ArthurianX · Mar 24, 2014 · 3ee6987 · 3ee6987
2 parents 1fbe4d0 + 9ba80ba
commit 3ee6987
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/client/views/editor-tag-widget.js b/core/client/views/editor-tag-widget.js
@@ -106,8 +106,11 @@
                 styles = {
                     left: $target.position().left
                 },
-                maxSuggestions = 5, // Limit the suggestions number
-                regexTerm = searchTerm.replace(/(\s+)/g, "(<[^>]+>)*$1(<[^>]+>)*"),
+                // Limit the suggestions number
+                maxSuggestions = 5,
+                // Escape regex special characters
+                escapedTerm = searchTerm.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&'),
+                regexTerm = escapedTerm.replace(/(\s+)/g, "(<[^>]+>)*$1(<[^>]+>)*"),
                 regexPattern = new RegExp("(" + regexTerm + ")", "i");
 
             this.$suggestions.css(styles);
@@ -120,6 +123,7 @@
             _.each(matchingTags, function (matchingTag) {
                 var highlightedName,
                     suggestionHTML;
+
                 highlightedName = matchingTag.name.replace(regexPattern, function (match, p1) {
                     return "<mark>" + _.escape(p1) + "</mark>";
                 });