Mercurial > eldonilo > lightstring

diff transports/bosh.js @ 106:c06ec02217ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
many changes
author Sonny Piers <sonny@fastmail.net>
date Tue, 26 Jun 2012 12:02:14 +0200
parents 3e124209821a
children 5cb4733c5189
line wrap: on
line diff
old mode 100644
new mode 100755
--- a/transports/bosh.js
+++ b/transports/bosh.js
@@ -54,20 +54,19 @@
     //   }
     // }
 
-    var body = '<body rid="' + this.rid++ + '"  xmlns="http://jabber.org/protocol/httpbind"/>';
-    var body = Lightstring.XML2DOM(body);
+    var body = new Lightstring.Stanza('<body rid="' + this.rid++ + '"  xmlns="http://jabber.org/protocol/httpbind"/>');
 
     //sid
     if (this.sid)
-      body.setAttribute('sid', this.sid);
+      body.el.setAttribute('sid', this.sid);
 
     //attributes on body
     for (var i in attrs)
-      body.setAttribute(i, attrs[i]);
+      body.el.setAttribute(i, attrs[i]);
 
     //children
     for (var i in children)
-      body.appendChild(children[i]);
+      body.el.appendChild(children[i]);
 
 
 
@@ -99,7 +98,7 @@
 
       var body = this.response;
       that.emit('rawin', body);
-      var bodyEl = Lightstring.XML2DOM(body);
+      var bodyEl = Lightstring.parse(body);
       that.processResponse(bodyEl)
       if (aOnSuccess)
         aOnSuccess(bodyEl);
@@ -117,14 +116,15 @@
     //   }
     // });
     // this.emit('rawout', body.toString());
+    if (body.children) {
+      for(var i = 0; i < body.children.length; i++) {
+        var child = body.children[i];
+        that.emit('out', child);
+      }
+    }
+    this.emit('rawout', body);
 
-    for(var i = 0; i < body.children.length; i++) {
-      var child = body.children[i];
-      that.emit('out', child);
-    }
-    this.emit('rawout', Lightstring.DOM2XML(body))
-
-    req.send(Lightstring.DOM2XML(body));
+    req.send(Lightstring.serialize(body));
     this.currentRequests++;
   };
   Lightstring.BOSHConnection.prototype.send = function(aData) {
@@ -134,7 +134,7 @@
 
     else if(typeof aData == 'string') {
       try {
-        var el = Lightstring.XML2DOM(aData);
+        var el = Lightstring.parse(aData);
       }
       catch(e) {
         console.log(e);