Changeset 13343

Timestamp:

04/17/08 01:56:15 (7 months ago)

Author:

wolfram

Message:

+ optimized refs#6461 as of Bill's suggestion, thx

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.
-                        var pos = label.toLowerCase().indexOf(this._lastInput.toLowerCase());
-                        if (pos!=-1) {
-                                var l = this._lastInput.length;
-                                var e = this._escapeHtml;
-                                return e(label.substr(0, pos)) + '<span class="dijitComboBoxHighlightMatch">' +
-                                                e(label.substr(pos, l)) + '</span>' + e(label.substr(pos+l));
-                        }
-                        return label;
+                        return this._escapeHtml(label).replace(
+                                new RegExp("("+ this._escapeHtml(this._lastInput) +")", "i"),
+                                '<span class="dijitComboBoxHighlightMatch">$1</span>');
+                        // returns String, (almost) valid HTML (entities encoded)
                 },