Changeset 15139

Timestamp:

09/05/08 02:11:00 (3 months ago)

Author:

bill

Message:

Change InlineEditBox? to use <span> instead of <fieldset>, to workaround
IE bugs (?) setting innerHTML for the button labels.
Fixes #7593 !strict.

Also added some button tests.

Location:

dijit/trunk

Files:

• templates/InlineEditBox.html (modified) (1 diff)
• tests/form/test_Button.html (modified) (1 diff)

dijit/trunk/templates/InlineEditBox.html

@@ -1 @@
-<fieldset dojoAttachPoint="editNode" waiRole="presentation" style="position: absolute; visibility:hidden" class="dijitReset dijitInline"
+<span dojoAttachPoint="editNode" waiRole="presentation" style="position: absolute; visibility:hidden" class="dijitReset dijitInline"
         dojoAttachEvent="onkeypress: _onKeyPress" 
-        ><div dojoAttachPoint="editorPlaceholder"></div
+        ><span dojoAttachPoint="editorPlaceholder"></span
         ><span dojoAttachPoint="buttonContainer"
-                ><button class='saveButton' dojoAttachPoint="saveButton" dojoType="dijit.form.Button" dojoAttachEvent="onClick:save" disabled="true">${buttonSave}</button
-                ><button class='cancelButton' dojoAttachPoint="cancelButton" dojoType="dijit.form.Button" dojoAttachEvent="onClick:cancel">${buttonCancel}</button
+                ><button class='saveButton' dojoAttachPoint="saveButton" dojoType="dijit.form.Button" dojoAttachEvent="onClick:save" disabled="true" label="${buttonSave}"></button
+                ><button class='cancelButton' dojoAttachPoint="cancelButton" dojoType="dijit.form.Button" dojoAttachEvent="onClick:cancel" label="${buttonCancel}"></button
         ></span
-></fieldset>
+></span>

dijit/trunk/tests/form/test_Button.html

@@ -246 +246 @@
                         });
                 }
+                function getLabels(){
+                        forEachButton(function(widget){
+                                console.log(widget.attr('label'));
+                        });
+                }
         </script>
         <div>
                 <button id="toggle" onclick='toggleDisabled()'>Disable all</button>
                 <button onclick='changeLabels()'>Change labels</button>
+                <button onclick='getLabels()'>Get labels</button>
                 <button onclick='location.reload()'>Revert</button>
         </div>
         <h3>Button instantiated via javacript:</h3>
-        <div id="buttonContainer"></div>
+        <p id="buttonContainer" style="display: none;"></p>
         <script type="text/javascript">
                 // See if we can make a button in script and attach it to the DOM ourselves.
                 dojo.addOnLoad(function(){
-                        var params = {
+                        var widget = new dijit.form.Button({
                                 label: "hello!",
                                 name: "programmatic"
-                        };
-                        var widget = new dijit.form.Button(params, "buttonContainer");
+                        });
+                        widget.placeAt("buttonContainer");      // place in page
+
+                        var widget2 = new dijit.form.Button({
+                                label: "hello!",
+                                name: "programmatic"
+                        });
+                        widget2.attr("label", "i'm programmatic too");  // change label (for testing)
+                        widget2.placeAt("buttonContainer");     // place in page
                 });
         </script>