Changeset 11947

Timestamp:

01/03/08 22:26:35 (12 months ago)

Author:

bill

Message:

Fixes #5501: ComboBox? double-escaping HTML entities in inlined data

Location:

dijit/trunk

Files:

• form/ComboBox.js (modified) (2 diffs)
• tests/form/test_FilteringSelect.html (modified) (1 diff)

dijit/trunk/form/ComboBox.js

@@ -715 +715 @@
                         //              FilteringSelect
 
-                        var labelObject=labelFunc(item);
+                        var labelObject = labelFunc(item);
                         var menuitem = document.createElement("div");
                         if(labelObject.html){
@@ -968 +968 @@
                                                 /* attribute-name-string */ attribute, 
                                                 /* value? */ defaultValue){
-                return attribute == "value" ? item.value : item.innerHTML;
+                return (attribute == "value") ? item.value : (item.innerText || item.textContent);
         },
 

dijit/trunk/tests/form/test_FilteringSelect.html

@@ -253 +253 @@
                 <br>
                 <hr>
+                <p>FilteringSelect #12: special characters</p>
+                <p>The drop down list should be:</p>
+                <ul>
+                   <li>sticks &amp; stones
+                   <li>rags --&gt; riches
+                </ul>
+                <label for="filter12">Special chars:</label>
+                <select dojoType="dijit.form.FilteringSelect"
+                        name="filter12"
+                        id="filter12"
+                >
+                        <option value="sticks" selected>sticks &amp; stones</option>
+                        <option value="rags">rags --&gt; riches</option>
+                </select>
+                <br>
+                <hr>
                 <input type="submit">
         </form>