Changeset 13614

Timestamp:

05/07/08 04:51:34 (7 months ago)

Author:

wolfram

Message:

+ refs#6461, make highlightMatch take one of: first, all, none

Location:

dijit/trunk

Files:

• form/ComboBox.js (modified) (3 diffs)
• tests/form/test_ComboBox.html (modified) (3 diffs)

dijit/trunk/form/ComboBox.js

@@ -40 +40 @@
                 autoComplete: true,
 
-                // highlightMatch: Boolean
+                // highlightMatch: String
+                //              One of: "first", "all" or "none".
                 //              If the ComboBox opens with the serach results and the searched
                 //              string can be found it will be highlighted.
                 //              This value is not considered when labelType!="text" to not
                 //              screw up any mark up the label might contain.
-                highlightMatch: true,
+                highlightMatch: "first",
                 
                 // searchDelay: Integer
@@ -636 +637 @@
                         var labelType = this.labelType;
                         // If labelType is not "text" we don't want to screw any markup ot whatever.
-                        if (this.highlightMatch==true && this.labelType=="text" && this._lastInput){
+                        if (this.highlightMatch!="none" && this.labelType=="text" && this._lastInput){
                                 label = this.doHighlight(label);
                                 labelType = "html";
@@ -649 +650 @@
                         //              to implement your custom highlighing.
                         return this._escapeHtml(label).replace(
-                                new RegExp("("+ this._escapeHtml(this._lastInput) +")", "i"),
+                                // 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)

dijit/trunk/tests/form/test_ComboBox.html

@@ -205 +205 @@
         </div>
         <hr>
-        <p>ComboBox #4: url, autoComplete=false required=true and highlightMatch=false</p>
+        <p>ComboBox #4: url, autoComplete=false required=true and highlightMatch="none"</p>
         <label for="combobox4">US State test 4: </label>
         <input dojoType="dijit.form.ComboBox"
@@ -218 +218 @@
                         id="combobox4"
                         required="true"
-                        highlightMatch="false"
+                        highlightMatch="none"
         >
         <span>Value: <input id="value4" disabled></span>
         <hr>
-        <p>A ComboBox with no arrow</p>
+        <p>A ComboBox with no arrow, and with highlightMatch="all", which highlights all matches (the server is not searching accordingly!)</p>
         <input dojoType="dijit.form.ComboBox"
                         value="California"
@@ -230 +230 @@
                         autoComplete="false"
                         hasDownArrow="false"
+                        highlightMatch="all"
         >
         <hr>