Thanks to FroMage for adding support for xml document posts in XHR! a…

…lso addresses incorrect XMLHttpRequest constants as noted in http://envjs.lighthouseapp.com/projects/21590/tickets/113-add-support-for-xhrsenddocument
thatcher · Mar 17, 2010 · 2cc8e59 · 2cc8e59
1 parent c9fdb70
commit 2cc8e59
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/src/platform/rhino/xhr.js b/src/platform/rhino/xhr.js
@@ -184,15 +184,26 @@ Envjs.connection = function(xhr, responseHandler, data){
         }
 
         //write data to output stream if required
-        if(data&&data.length&&data.length>0){
-             if ( xhr.method == "PUT" || xhr.method == "POST" ) {
-                connection.setDoOutput(true);
-                var outstream = connection.getOutputStream(),
-                    outbuffer = new java.lang.String(data).getBytes('UTF-8');
-
-                outstream.write(outbuffer, 0, outbuffer.length);
-                outstream.close();
+        if(data){
+            if(data instanceof Document){
+                if ( xhr.method == "PUT" || xhr.method == "POST" ) {
+                    connection.setDoOutput(true);
+                    var outstream = connection.getOutputStream(),
+                        xml = (new XMLSerializer()).serializeToString(data),
+                        outbuffer = new java.lang.String(xml).getBytes('UTF-8');
+                    outstream.write(outbuffer, 0, outbuffer.length);
+                    outstream.close();
+                }
+            }else if(data.length&&data.length>0){
+                if ( xhr.method == "PUT" || xhr.method == "POST" ) {
+                    connection.setDoOutput(true);
+                    var outstream = connection.getOutputStream(),
+                        outbuffer = new java.lang.String(data).getBytes('UTF-8');
+                    outstream.write(outbuffer, 0, outbuffer.length);
+                    outstream.close();
+                }
             }
+            connection.connect();
         }else{
             connection.connect();
         }

diff --git a/src/xhr/xmlhttprequest.js b/src/xhr/xmlhttprequest.js
@@ -16,12 +16,12 @@ XMLHttpRequest = function(){
     this.aborted = false;//non-standard
 };
 
-// it would be nice if these were part of the standard but
-// they are not.
+// defined by the standard: http://www.w3.org/TR/XMLHttpRequest/#xmlhttprequest
+// but not provided by Firefox.  Safari and others do define it.
 XMLHttpRequest.UNSENT = 0;
-XMLHttpRequest.OPEN = 0;
-XMLHttpRequest.HEADERS_RECEIVED = 0;
-XMLHttpRequest.LOADING = 0;
+XMLHttpRequest.OPEN = 1;
+XMLHttpRequest.HEADERS_RECEIVED = 2;
+XMLHttpRequest.LOADING = 3;
 XMLHttpRequest.DONE = 4;
 
 XMLHttpRequest.prototype = {