Mercurial > eldonilo > lightstring

changeset 89:55548845b177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typos
author Sonny Piers <sonny.piers@gmail.com>
date Wed, 29 Feb 2012 17:48:05 +0100
parents 595be4a8584f
children c1566c6981e5
files lightstring.js plugins/pubsub.js
diffstat 2 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lightstring.js
+++ b/lightstring.js
@@ -174,7 +174,7 @@ Lightstring.Connection.prototype = {
 
       var stream = Lightstring.stanzas.stream.open(Conn.jid.domain);
       //FIXME: Use Lightstring.Connection.send (problem with parsing steam);
-      Conn.socket.send(stream);
+      this.send(stream);
       var stanza = {
         XML: stream
       };
@@ -204,7 +204,7 @@ Lightstring.Connection.prototype = {
         //SASL mechanisms
         if (stanza.DOM.firstChild.localName === 'mechanisms') {
           stanza.mechanisms = [];
-          var nodes = stanza.DOM.querySelectorAll('mechanism');
+          var nodes = stanza.DOM.getElementsByTagName('mechanism');
           for (var i = 0; i < nodes.length; i++)
             stanza.mechanisms.push(nodes[i].textContent);
           Conn.emit('mechanisms', stanza);
@@ -231,11 +231,11 @@ Lightstring.Connection.prototype = {
         if (payload)
           Conn.emit('iq/' + payload.namespaceURI + ':' + payload.localName, stanza);
 
-        var id = stanza.DOM.getAttributeNS(null, 'id');
+        var id = stanza.DOM.getAttribute('id');
         if (!(id && id in Conn.callbacks))
           return;
 
-        var type = stanza.DOM.getAttributeNS(null, 'type');
+        var type = stanza.DOM.getAttribute('type');
         if (type !== 'result' && type !== 'error')
           return; //TODO: warning
 
@@ -268,16 +268,16 @@ Lightstring.Connection.prototype = {
       return;
 
     if (stanza.DOM.tagName === 'iq') {
-      var type = stanza.DOM.getAttributeNS(null, 'type');
+      var type = stanza.DOM.getAttribute('type');
       if (type !== 'get' || type !== 'set')
         ; //TODO: error
 
       var callback = {success: aSuccess, error: aError};
 
-      var id = stanza.DOM.getAttributeNS(null, 'id');
+      var id = stanza.DOM.getAttribute('id');
       if (!id) {
         var id = Lightstring.newId('sendiq:');
-        stanza.DOM.setAttributeNS(null, 'id', id);
+        stanza.DOM.setAttribute('id', id);
       }
 
       this.callbacks[id] = callback;
@@ -343,7 +343,7 @@ Lightstring.Connection.prototype = {
     if (!handlers)
       return;
 
-    //No data events
+    //Non-data events
     if(!aData) {
       for (var i = 0; i < handlers.length; i++)
         handlers[i].call(this, aData);
@@ -371,12 +371,12 @@ Lightstring.Connection.prototype = {
     }
 
     if (aData && aData.DOM) {
-      var type = aData.DOM.getAttributeNS(null, 'type');
+      var type = aData.DOM.getAttribute('type');
       if (type !== 'get' && type !== 'set')
         return;
 
-      var from = aData.DOM.getAttributeNS(null, 'from');
-      var id = aData.DOM.getAttributeNS(null, 'id');
+      var from = aData.DOM.getAttribute('from');
+      var id = aData.DOM.getAttribute('id');
       this.send(Lightstring.stanzas.errors.iq(from, id, 'cancel', 'service-unavailable'));
     }
   },
--- a/plugins/pubsub.js
+++ b/plugins/pubsub.js
@@ -46,9 +46,12 @@
       retract: function(aTo, aNode, aItem) {
         return  "<iq type='set' to='" + aTo + "'><pubsub xmlns='" + Lightstring.ns.pubsub + "'><retract node='" + aNode + "'><item id='" + aItem + "'/></retract></pubsub></iq>";
       },
-      'delete': function(aTo, aNode, aURI) {
+      delete: function(aTo, aNode) {
         return  "<iq type='set' to='" + aTo + "'><pubsub xmlns='" + Lightstring.ns.pubsub_owner + "'><delete node='" + aNode + "'/></pubsub></iq>";
       },
+      purge: function(aTo, aNode) {
+        return  "<iq type='set' to='" + aTo + "'><pubsub xmlns='" + Lightstring.ns.pubsub_owner + "'><purge node='" + aNode + "'/></pubsub></iq>";
+      },
       create: function(aTo, aNode, aFields) {
         var iq = "<iq type='set' to='" + aTo + "'><pubsub xmlns='" + Lightstring.ns.pubsub + "'><create node='" + aNode + "'/>";
         if (aFields) {
@@ -112,9 +115,12 @@
       publish: function(aTo, aNode, aItem, aId, aResult, aError) {
         this.send(Lightstring.stanzas.pubsub.publish(aTo, aNode, aItem, aId), aResult, aError);
       },
-      'delete': function(aTo, aNode, aResult, aError) {
+      delete: function(aTo, aNode, aResult, aError) {
         this.send(Lightstring.stanzas.pubsub.delete(aTo, aNode), aResult, aError);
       },
+      purge: function(aTo, aNode, aResult, aError) {
+        this.send(Lightstring.stanzas.pubsub.purge(aTo, aNode), aResult, aError);
+      },
       getAffiliations: function(aTo, aNode, aResult, aError) {
         this.send(Lightstring.stanzas.pubsub.affiliations(aTo, aNode), function(stanza) {
           if((stanza.DOM.getAttribute('type') === 'result') && aResult, aError) {