Changeset 13615

Timestamp:

05/07/08 05:50:32 (7 months ago)

Author:

wolfram

Message:

+ refs#6461, make highlightMatch find matches only at the beginning of a string and at word boundaries, this is more natural

Files:

• dijit/trunk/form/ComboBox.js (modified) (1 diff)

dijit/trunk/form/ComboBox.js

@@ -649 +649 @@
                         //              highlights the first occurence found. Override this method
                         //              to implement your custom highlighing.
-                        return this._escapeHtml(label).replace(
-                                // Add greedy when this.highlightMatch=="all"
-                                new RegExp("("+ this._escapeHtml(this._lastInput) +")", "i"+(this.highlightMatch=="all"?"g":"")),
-                                '<span class="dijitComboBoxHighlightMatch">$1</span>');
-                        // returns String, (almost) valid HTML (entities encoded)
+                        var find = this._escapeHtml(this._lastInput);
+                        // Add greedy when this.highlightMatch=="all"
+                        var modifiers = "i"+(this.highlightMatch=="all"?"g":"");
+                        var escapedLabel = this._escapeHtml(label);
+                        ret = escapedLabel.replace(new RegExp("^("+ find +")", modifiers),
+                                        '<span class="dijitComboBoxHighlightMatch">$1</span>');
+                        if (escapedLabel==ret){ // Nothing replaced, try to replace at word boundaries.
+                                ret = escapedLabel.replace(new RegExp(" ("+ find +")", modifiers),
+                                        ' <span class="dijitComboBoxHighlightMatch">$1</span>');
+                        }
+                        return ret;// returns String, (almost) valid HTML (entities encoded)
                 },