Bug #9453: Fix highlighting escaped symbols in autocomplete

diff --git a/framework/Core/js/autocomplete.js b/framework/Core/js/autocomplete.js
index 28256d1..5cf28e5 100644 (file)
--- a/framework/Core/js/autocomplete.js
+++ b/framework/Core/js/autocomplete.js
@@ -112,13 +112,23 @@ Autocompleter.Base = Class.create({
                 this.knl.hide();
             }
         } else {
-            re = new RegExp("(" + this.getToken() + ")", "i");
+            re = new RegExp(this.getToken(), "i");
 
             choices.each(function(n) {
-                c.push({
-                    l: n.escapeHTML().gsub(re, '<strong>#{1}</strong>'),
-                    v: n
+                var m = n.match(re),
+                    out = { l: '', v: n };
+
+                n.match(re).each(function(m) {
+                    var idx = n.indexOf(m);
+                    out.l += n.substr(0, idx).escapeHTML() + '<strong>' + m.escapeHTML() + '</strong>';
+                    n = n.substr(idx + m.length);
                 });
+
+                if (n.length) {
+                    out.l += n.escapeHTML();
+                }
+
+                c.push(out);
             });
 
             if (!this.knl) {