Changeset 4650

Timestamp:

02/05/08 20:05:23 (10 months ago)

Author:

malsup

Message:

Use core httpData method and fix unit test.

Location:

trunk/plugins/form

Files:

• jquery.form.js (modified) (3 diffs)
• test/index.html (modified) (1 diff)

trunk/plugins/form/jquery.form.js

@@ -1 +1 @@
 /*
  * jQuery Form Plugin
- * version: 2.03 (01/20/2008)
+ * version: 2.04 (02/05/2008)
  * @requires jQuery v1.1 or later
  *
@@ -193 +193 @@
 
     var a = this.formToArray(options.semantic);
-    if (options.data) {
-        for (var n in options.data)
-            a.push( { name: n, value: options.data[n] } );
-    }
+    if (options.data) {
+        for (var n in options.data)
+            a.push( { name: n, value: options.data[n] } );
+    }
 
     // give pre-submit callback an opportunity to abort the submit
@@ -327 +327 @@
                 xhr.responseText = doc.body ? doc.body.innerHTML : null;
                 xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+                xhr.getResponseHeader = function(header){
+                    var headers = {'content-type': opts.dataType};
+                    return headers[header];
+                };
 
                 if (opts.dataType == 'json' || opts.dataType == 'script') {
                     var ta = doc.getElementsByTagName('textarea')[0];
-                    data = ta ? ta.value : xhr.responseText;
-                    if (opts.dataType == 'json')
-                        eval("data = " + data);
-                    else
-                        $.globalEval(data);
+                    xhr.responseText = ta ? ta.value : xhr.responseText;
                 }
-                else if (opts.dataType == 'xml') {
-                    data = xhr.responseXML;
-                    if (!data && xhr.responseText != null)
-                        data = toXml(xhr.responseText);
+                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+                    xhr.responseXML = toXml(xhr.responseText);
                 }
-                else {
-                    data = xhr.responseText;
-                }
+                data = $.httpData(xhr, opts.dataType);
             }
             catch(e){

trunk/plugins/form/test/index.html

@@ -152 +152 @@
     $('#form1').clearForm();
     val = $el.val();
-    ok( '' == val, 'success: ' + val);
+    ok( !val, 'success: ' + val);
 });