Changeset 12261

Timestamp:

02/02/08 22:19:36 (11 months ago)

Author:

doughays

Message:

Fixes #5746. Grab encType from srcNodeRef for IE. Added file upload form test but encType must be specified as multipart/form-data for this to work.

Location:

dijit/trunk

Files:

• form/Form.js (modified) (3 diffs)
• tests/form/Form.html (modified) (2 diffs)

dijit/trunk/form/Form.js

@@ -251 +251 @@
                 action: "",
                 method: "",
-                enctype: "multipart/form-data",
+                encType: "",
                 "accept-charset": "",
                 accept: "",
@@ -259 +259 @@
 
                 attributeMap: dojo.mixin(dojo.clone(dijit._Widget.prototype.attributeMap),
-                        {onSubmit: "", action: "", method: "", enctype: "", "accept-charset": "", accept: "", target: ""}),
+                        {onSubmit: "", action: "", method: "", encType: "", "accept-charset": "", accept: "", target: ""}),
 
                 // execute: Function
@@ -268 +268 @@
                 //      Deprecated: use onSubmit
                 onExecute: function(){},
+
+                postCreate: function(){
+                        // IE tries to hide encType
+                        if(dojo.isIE && this.srcNodeRef && this.srcNodeRef.attributes){
+                                var item = this.srcNodeRef.attributes.getNamedItem('encType');
+                                if(item && (typeof item.value == "string")){
+                                        this.setAttribute('encType', item.value);
+                                        this.domNode.encoding = item.value;
+                                }
+                        }
+                        this.inherited(arguments);
+                },
 
                 // TODO: remove ths function beginning with 2.0

dijit/trunk/tests/form/Form.html

@@ -107 +107 @@
 <div style="color:red">Currently only widgets are supported, not raw elements.</div>
 <!--    to test form submission, you'll need to create an action handler similar to
-        http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
-<form dojoType="dijit.form.Form" id="myForm" onsubmit="alert('Attempting to submit form w/values:\n'+dojo.toJson(this.getValues(),true));if(this.isValid()){return confirm('Form is valid, press OK to submit');}else{alert('Form contains invalid data.  Please correct first');return false;}">
+        http://www.utexas.edu/teamweb/cgi-bin/generic.cgi 
+        http://www.tipjar.com/cgi-bin/test -->
+<form dojoType="dijit.form.Form" id="myForm" encType="multipart/form-data" action="" method="" onsubmit="alert('Attempting to submit form w/values:\n'+dojo.toJson(this.getValues(),true));if(this.isValid()){return confirm('Form is valid, press OK to submit');}else{alert('Form contains invalid data.  Please correct first');return false;}">
 <p>Just HTML text</p>
 <table border=2>
@@ -259 +260 @@
 </tr>
 
+<tr>
+<td>File upload</td><td>filename</td>
+<td>
+<input dojoType="dijit.form.TextBox" name="filename" type="file">
+</td>
+</tr>
 </table>