[Xmpp4js-commit] SF.net SVN: xmpp4js: [696] trunk
Status: Beta
Brought to you by:
h-iverson
Menu
▾
▴
[Xmpp4js-commit] SF.net SVN: xmpp4js: [696] trunk
|
From: <h-i...@us...> - 2008-02-23 09:51:19
|
Revision: 696
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=696&view=rev
Author: h-iverson
Date: 2008-02-23 01:50:46 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
merged xml4script-port branch back into trunk. for the love of god, could not get 'svn merge' to work. just diffed :\.
Modified Paths:
--------------
trunk/pom.xml
trunk/src/assembler/xmpp4js.xml
trunk/src/main/javascript/DomBuilder.js
trunk/src/main/javascript/StanzaProvider.js
trunk/src/main/javascript/ext/DataForm.js
trunk/src/main/javascript/ext/DataStorage.js
trunk/src/main/javascript/ext/ServiceDisco.js
trunk/src/main/javascript/msie-createElementNS.js
trunk/src/main/javascript/msie-importNode.js
trunk/src/main/javascript/muc/MucPresenceFilter.js
trunk/src/main/javascript/packet/Base.js
trunk/src/main/javascript/packet/IQ.js
trunk/src/main/javascript/packet/PacketExtension.js
trunk/src/main/javascript/packet/PacketListenerManager.js
trunk/src/main/javascript/packet/Presence.js
trunk/src/main/javascript/packet/Registration.js
trunk/src/main/javascript/packetfilter/Errors.js
trunk/src/main/javascript/packetfilter/PacketExtensionFilter.js
trunk/src/main/javascript/roster/RosterItemManager.js
trunk/src/main/javascript/roster/RosterPacket.js
trunk/src/main/javascript/transport/BOSH.js
trunk/src/test/javascript/BOSHTransportTest.html
trunk/src/test/javascript/ChatManagerTest.html
trunk/src/test/javascript/DomBuilderTest.html
trunk/src/test/javascript/DomHacksTest.html
trunk/src/test/javascript/ExtensionProviderTest.html
trunk/src/test/javascript/MUC_FilterTest.html
trunk/src/test/javascript/MUC_JoinTest.html
trunk/src/test/javascript/PacketFilterTest.html
trunk/src/test/javascript/PacketHelperTest.html
trunk/src/test/javascript/PacketReaderTest.html
trunk/src/test/javascript/RosterItemManagerTest.html
trunk/src/test/javascript/common-test-library.js
trunk/src/test/javascript/includes.js
Added Paths:
-----------
trunk/nbactions.xml
trunk/src/main/javascript/console.js
Added: trunk/nbactions.xml
===================================================================
--- trunk/nbactions.xml (rev 0)
+++ trunk/nbactions.xml 2008-02-23 09:50:46 UTC (rev 696)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>build</actionName>
+ <packagings>
+ <packaging>*</packaging>
+ </packagings>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </action>
+ </actions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/pom.xml 2008-02-23 09:50:46 UTC (rev 696)
@@ -39,6 +39,13 @@
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.xml4script</groupId>
+ <artifactId>xml4script</artifactId>
+ <type>javascript</type>
+ <version>3.1-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
<build>
@@ -113,13 +120,13 @@
<repository>
<id>mvn.soashable.com</id>
<url>
- http://mvn.soashable.com:8081/artifactory/libs-releases
+ http://mvn.soashable.com/artifactory/libs-releases
</url>
</repository>
<snapshotRepository>
<id>mvn.soashable.com</id>
<url>
- http://mvn.soashable.com:8081/artifactory/libs-snapshots
+ http://mvn.soashable.com/artifactory/libs-snapshots
</url>
</snapshotRepository>
<site>
@@ -165,7 +172,7 @@
<repositories>
<repository>
<id>soashable-libs-snapshots</id>
- <url>http://mvn.soashable.com:8081/artifactory/libs-snapshots</url>
+ <url>http://mvn.soashable.com/artifactory/libs-snapshots</url>
<releases>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
@@ -178,4 +185,4 @@
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/src/assembler/xmpp4js.xml
===================================================================
--- trunk/src/assembler/xmpp4js.xml 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/assembler/xmpp4js.xml 2008-02-23 09:50:46 UTC (rev 696)
@@ -5,8 +5,8 @@
<fileName>xmpp4js.js</fileName>
<includes>
<!-- utils -->
+ <include>console.js</include>
<include>Jid.js</include>
- <include>msie-importNode.js</include>
<include>msie-createElementNS.js</include>
<include>DomBuilder.js</include>
Modified: trunk/src/main/javascript/DomBuilder.js
===================================================================
--- trunk/src/main/javascript/DomBuilder.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/DomBuilder.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -55,7 +55,7 @@
// if content is set, append it to childElements
if(content) {
// if content isn't an element, create a text node for it
- if( !(content instanceof Element) ) {
+ if( !(content instanceof DOMElement) ) {
content = parentDoc.createTextNode( content );
}
@@ -66,13 +66,13 @@
var elem;
if( attributes["xmlns"] !== undefined ) {
- elem = createElementNS(parentDoc, attributes["xmlns"], elementName );
+ elem = parentDoc.createElementNS( attributes["xmlns"], elementName );
} else if( elementName.indexOf(":") > -1 ) {
var prefix = elementName.substring( 0, elementName.indexOf(":") );
var xmlns = attributes[ "xmlns:" + prefix ];
if( xmlns ) {
- elem = createElementNS(parentDoc, xmlns, elementName );
+ elem = parentDoc.createElementNS( xmlns, elementName );
} else {
elem = parentDoc.createElement( elementName );
@@ -83,7 +83,11 @@
// add attributes
for( var k in attributes ) {
- elem.setAttribute( k, attributes[k] );
+ try {
+ elem.setAttribute( k, attributes[k] );
+ } catch(e) {
+;;; alert( "Could not set attribute: "+k+"="+attributes[k]+". current="+elem.getAttribute(k).toString() );
+ }
}
// add childElements
for( var i = 0; i < childElements.length; i++ ) {
@@ -92,4 +96,4 @@
// return newly created element
return elem;
-}
\ No newline at end of file
+}
Modified: trunk/src/main/javascript/StanzaProvider.js
===================================================================
--- trunk/src/main/javascript/StanzaProvider.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/StanzaProvider.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -43,7 +43,7 @@
* @return {Xmpp4Js.Packet.Base} A packet object representing the node.
*/
fromNode: function( stanzaNode ) {
- if( !(stanzaNode instanceof Element) ) {
+ if( !(stanzaNode instanceof DOMElement) ) {
// TODO throw error or something.
return undefined;
}
@@ -106,7 +106,7 @@
}
Xmpp4Js.Packet.StanzaProvider._ElemNameProvider = function( stanzaNode, packetType ) {
- return stanzaNode.localName.toLowerCase() == packetType.toLowerCase();
+ return stanzaNode.nodeName.toLowerCase() == packetType.toLowerCase();
}
Xmpp4Js.Packet.StanzaProvider.IQProvider = function( stanzaNode ) {
Added: trunk/src/main/javascript/console.js
===================================================================
--- trunk/src/main/javascript/console.js (rev 0)
+++ trunk/src/main/javascript/console.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -0,0 +1,10 @@
+if( window['console'] == undefined ) {
+ console = {
+ info: Ext.emptyFn,
+ log: Ext.emptyFn,
+ dir: Ext.emptyFn,
+ dirxml: Ext.emptyFn,
+ warn: Ext.emptyFn,
+ error: Ext.emptyFn
+ }
+}
Modified: trunk/src/main/javascript/ext/DataForm.js
===================================================================
--- trunk/src/main/javascript/ext/DataForm.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/ext/DataForm.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -32,7 +32,7 @@
* Clones the given node and returns a reference to it
*/
DataForm.prototype.read = function(node) {
- if( node.localName != "x" || node.namespaceURI != "jabber:x:data" ) {
+ if( node.nodeName != "x" || node.namespaceURI != "jabber:x:data" ) {
//parentNode = node;
alert( "nothin" );
@@ -56,7 +56,7 @@
var newNode = this.node.cloneNode(true);
newNode = importNode( node.ownerDocument, newNode, true );
- if( node.localName == "x" && node.namespanamespaceURI == "jabber:x:data" ) {
+ if( node.nodeName == "x" && node.namespanamespaceURI == "jabber:x:data" ) {
var parentNode = node.parentNode;
newNode = parentNode.replaceChild( newNode, node );
} else {
Modified: trunk/src/main/javascript/ext/DataStorage.js
===================================================================
--- trunk/src/main/javascript/ext/DataStorage.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/ext/DataStorage.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -30,7 +30,7 @@
contentNode.setAttribute( "xmlns", xmlns );
if( typeof(data) == 'string' ) {
- contentNode.textContent = data;
+ contentNode.setTextContent( data );
} else {
contentNode.appendChild( data );
}
Modified: trunk/src/main/javascript/ext/ServiceDisco.js
===================================================================
--- trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/ext/ServiceDisco.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -207,9 +207,9 @@
}
var itemNodes = responseQuery.childNodes;
- for ( var i=0; i < itemNodes.length; i++ ) {
- var item = itemNodes[ i ];
- if( item.localName == "item" ) {
+ for ( var i=0; i < itemNodes.getLength(); i++ ) {
+ var item = itemNodes.item( i );
+ if( item.nodeName == "item" ) {
items.push({
jid: item.getAttribute( "jid" ),
name: item.getAttribute( "name" ),
@@ -240,16 +240,16 @@
}
var itemNodes = responseQuery.childNodes;
- for ( var i=0; i < itemNodes.length; i++ ) {
- var item = itemNodes[ i ];
+ for ( var i=0; i < itemNodes.getLength(); i++ ) {
+ var item = itemNodes.item( i );
- if( item.localName == "identity" ) {
+ if( item.nodeName == "identity" ) {
identities.push({
category: item.getAttribute( "category" ),
name: item.getAttribute( "name" ),
type: item.getAttribute( "type" )
});
- } else if( item.localName == "feature" ) {
+ } else if( item.nodeName == "feature" ) {
features.push( item.getAttribute( "var" ) );
}
}
@@ -363,8 +363,8 @@
var query = iq.getQuery();
- query.appendChild( iq.getDoc().createElement( "username" ) ).textContent = screenName;
- query.appendChild( iq.getDoc().createElement( "password" ) ).textContent = password;
+ query.appendChild( iq.getDoc().createElement( "username" ) ).setTextContent( screenName );
+ query.appendChild( iq.getDoc().createElement( "password" ) ).setTextContent( password );
con.send( iq, function( packet ) {
if( packet.getType() == "error" ) {
@@ -383,4 +383,4 @@
} );
//} );
-}
\ No newline at end of file
+}
Modified: trunk/src/main/javascript/msie-createElementNS.js
===================================================================
--- trunk/src/main/javascript/msie-createElementNS.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/msie-createElementNS.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -1,10 +0,0 @@
-var createElementNS = function(doc, ns, elemName ) {
- if( doc.createElementNS != undefined ) {
- return doc.createElementNS( ns, elemName );
- } else {
- var elem = doc.createElement( elemName );
- elem.setAttribute( "xmlns", ns );
-
- return elem;
- }
-}
\ No newline at end of file
Modified: trunk/src/main/javascript/msie-importNode.js
===================================================================
--- trunk/src/main/javascript/msie-importNode.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/msie-importNode.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -1,90 +0,0 @@
-// adapted from http://www.alistapart.com/articles/crossbrowserscripting
-
-/* is this stuff defined? */
-if (!document.ELEMENT_NODE) {
- document.ELEMENT_NODE = 1;
- document.ATTRIBUTE_NODE = 2;
- document.TEXT_NODE = 3;
- document.CDATA_SECTION_NODE = 4;
- document.ENTITY_REFERENCE_NODE = 5;
- document.ENTITY_NODE = 6;
- document.PROCESSING_INSTRUCTION_NODE = 7;
- document.COMMENT_NODE = 8;
- document.DOCUMENT_NODE = 9;
- document.DOCUMENT_TYPE_NODE = 10;
- document.DOCUMENT_FRAGMENT_NODE = 11;
- document.NOTATION_NODE = 12;
-}
-
-function importNode(doc, node, allChildren) {
- if( !doc.importNode ) {
- /* find the node type to import */
- switch (node.nodeType) {
- case doc.ELEMENT_NODE:
- /* create a new element */
- var newNode = doc.createElement(node.nodeName);
- /* does the node have any attributes to add? */
- if (node.attributes && node.attributes.length > 0)
- /* add all of the attributes */
- for (var i = 0, il = node.attributes.length; i < il;)
- newNode.setAttribute(node.attributes[i].nodeName, node.getAttribute(node.attributes[i++].nodeName));
- /* are we going after children too, and does the node have any? */
- if (allChildren && node.childNodes && node.childNodes.length > 0)
- /* recursively get all of the child nodes */
- for (var i = 0, il = node.childNodes.length; i < il;)
- newNode.appendChild(importNode(doc, node.childNodes[i++], allChildren));
- return newNode;
- break;
- case document.TEXT_NODE:
- case document.CDATA_SECTION_NODE:
- case document.COMMENT_NODE:
- return doc.createTextNode(node.nodeValue);
- break;
- }
- } else {
- return doc.importNode( node, allChildren );
- }
-}
-
-/**
- * @return doc {Document}
- */
-function parseXmlToDoc( xml ) {
- var doc = null;
- if( Ext.isIE ) {
- // IE hack
- doc = new ActiveXObject("Msxml.DOMDocument");
- doc.loadXML( xml );
- } else {
- var parser = new DOMParser();
- doc = parser.parseFromString(xml, "text/xml");
- }
-
- return doc;
-}
-
-function serializeNode( node ) {
- var xml = Try.these(
- function() { return (new XMLSerializer()).serializeToString(node); },
- function() {
- var doc = new ActiveXObject("Msxml.DOMDocument");
- var node = importNode( doc, node, true );
- doc.appendChild( node );
-
- return doc.xml;
- }
- );
-
- return xml;
-}
-
-function createDocument() {
- return Try.these(
- function() { return document.implementation.createDocument("", "", null); },
- function() { return new ActiveXObject("Msxml.DOMDocument"); }
- );
-}
-
-document._importNode = function( node, allChildren ) {
- return importNode( document, node, allChildren );
-}
\ No newline at end of file
Modified: trunk/src/main/javascript/muc/MucPresenceFilter.js
===================================================================
--- trunk/src/main/javascript/muc/MucPresenceFilter.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/muc/MucPresenceFilter.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -31,8 +31,8 @@
// if this element contains a muc user extension
// TODO ideally this would load real packet extensions, but...
var elements = packet.getNode().childNodes;
- for( var i = 0; i < elements.length; i++ ) {
- var elem = elements[i];
+ for( var i = 0; i < elements.getLength(); i++ ) {
+ var elem = elements.item(i);
// namespace matches.
if( elem.namespaceURI == "http://jabber.org/protocol/muc#user" ) {
@@ -44,4 +44,4 @@
}
}
-Ext.extend( Xmpp4Js.Muc.MucPresenceFilter, Xmpp4Js.PacketFilter.PacketFilter, Xmpp4Js.Muc.MucPresenceFilter.prototype);
\ No newline at end of file
+Ext.extend( Xmpp4Js.Muc.MucPresenceFilter, Xmpp4Js.PacketFilter.PacketFilter, Xmpp4Js.Muc.MucPresenceFilter.prototype);
Modified: trunk/src/main/javascript/packet/Base.js
===================================================================
--- trunk/src/main/javascript/packet/Base.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/Base.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -37,7 +37,7 @@
this.elem.setAttribute( "id", id );
},
getId : function() {
- var id = this.elem.getAttribute( "id" );
+ var id = this.elem.getAttribute( "id" ).toString();
if( !id ) {
id = "id" + Math.random( 0,100 );
this.setId( id );
@@ -53,7 +53,7 @@
this.elem.setAttribute( "to", to );
},
getTo : function() {
- return this.elem.getAttribute( "to" );
+ return this.elem.getAttribute( "to" ).toString();
},
/**
@@ -64,7 +64,7 @@
this.elem.setAttribute( "from", from );
},
getFrom : function() {
- return this.elem.getAttribute( "from" );
+ return this.elem.getAttribute( "from" ).toString();
},
/**
@@ -75,7 +75,7 @@
this.elem.setAttribute( "to", to.toString() );
},
getToJid : function() {
- return new Xmpp4Js.Jid(this.elem.getAttribute( "to" ));
+ return new Xmpp4Js.Jid(this.elem.getAttribute( "to" ).toString());
},
/**
@@ -86,7 +86,7 @@
this.elem.setAttribute( "from", from.toString() );
},
getFromJid : function() {
- return new Xmpp4Js.Jid(this.elem.getAttribute( "from" ));
+ return new Xmpp4Js.Jid(this.elem.getAttribute( "from" ).toString());
},
@@ -95,7 +95,7 @@
this.elem.setAttribute( "type", type );
},
getType : function() {
- return this.elem.getAttribute( "type" );
+ return this.elem.getAttribute( "type" ).toString();
},
setNode : function(node) {
@@ -111,7 +111,7 @@
toString : function() {
var string = "Packet ["
- + "node (JSON)=" + (new XMLSerializer()).serializeToString(this.getNode())
+ + "node (JSON)="
+ ", type=" + this.getType()
+ ", from=" + this.getFrom()
+ ", to=" + this.getTo()
@@ -133,11 +133,11 @@
childNode = DomBuilder.node( elemName );
childNode = this.elem.appendChild( childNode );
}
- if( content instanceof Element ) {
- var importedContent = importNode( this.elem.ownerDocument, content, true );
+ if( content instanceof DOMElement ) {
+ var importedContent = this.elem.ownerDocument.importNode( content, true );
childNode.appendChild( importedContent );
} else {
- childNode.textContent = content;
+ childNode.setTextContent( content );
}
},
@@ -146,7 +146,7 @@
* Get a child element node if it exists.
*/
getChildElementNode : function(elemName) {
- return this.elem.getElementsByTagName(elemName)[0];
+ return this.elem.getElementsByTagName(elemName).item(0);
},
/**
@@ -157,7 +157,7 @@
var content = null;
if( node ) {
- content = node.textContent;
+ content = node.getStringValue();
}
if( content == null || content == "" ) {
@@ -232,13 +232,19 @@
/** @deprecated */
function createDocument() {
- return Try.these(
- function() { return document.implementation.createDocument("", "", null); },
- function() { return new ActiveXObject("Msxml.DOMDocument"); }
- );
+ return new DOMDocument(new DOMImplementation());
}
+/** @deprecated */
+function serializeNode(node) {
+ return node.toString();
+}
+/** @deprecated */
+function parseXmlToDoc(xml) {
+ return (new DOMImplementation()).loadXML(xml);
+}
+
Modified: trunk/src/main/javascript/packet/IQ.js
===================================================================
--- trunk/src/main/javascript/packet/IQ.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/IQ.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -32,14 +32,14 @@
this.elem.appendChild( elem );
},
getQuery : function() {
- var elem = this.elem.getElementsByTagName("query")[0];
+ var elem = this.elem.getElementsByTagName("query").item(0);
return elem;
},
/** @deprecated */
getQueryXMLNS : function() {
var query = this.getQuery();
- return query ? query.getAttribute("xmlns") : "";
+ return query ? query.getAttribute("xmlns").toString() : "";
}
}
Modified: trunk/src/main/javascript/packet/PacketExtension.js
===================================================================
--- trunk/src/main/javascript/packet/PacketExtension.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/PacketExtension.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -26,14 +26,14 @@
createNode : function() {
var doc = this.stanza.getNode().ownerDocument;
- this.elem = this.stanza.getNode().appendChild( createElementNS(doc, this.getElementNS(), this.getElementName() ) );
+ this.elem = this.stanza.getNode().appendChild( doc.createElementNS( this.getElementNS(), this.getElementName() ) );
},
readNode : function() {
//this.elem = stanza.getNode().getElementsByTagNameNS( this.getElementNS(), this.getElementName() )[0];
var nodes = this.stanza.getNode().childNodes;
- for( var i = 0; i < nodes.length; i++ ) {
- var child = nodes[i];
+ for( var i = 0; i < nodes.getLength(); i++ ) {
+ var child = nodes.item(i);
if( child.namespaceURI == this.getElementNS() ) {
this.elem = child;
break;
@@ -116,8 +116,8 @@
var extensions = [];
var children = stanza.getNode().childNodes;
- for( var i = 0; i < children.length; i++ ) {
- var child = children[i];
+ for( var i = 0; i < children.getLength(); i++ ) {
+ var child = children.item(i);
try {
var ext = this.read( child.namespaceURI, stanza );
@@ -164,7 +164,7 @@
// add the new state
var doc = this.getNode().ownerDocument;
- var node = createElementNS(doc, this.getElementNS(), this.getElementName() );
+ var node = doc.createElementNS( this.getElementNS(), this.getElementName() );
this.setNode( node );
@@ -245,8 +245,8 @@
readNode : function() {
Xmpp4Js.Ext.Error.superclass.readNode.call( this );
- this.code = this.getNode().getAttribute( "code");
- this.type = this.getNode().getAttribute( "type");
+ this.code = this.getNode().getAttribute( "code").toString();
+ this.type = this.getNode().getAttribute( "type").toString();
},
createNode : function(code, type) {
// since getElementName returns this.state, and createNode creates
@@ -293,7 +293,7 @@
setEvent : function(event) {
if( this.event ) {
// remove the current event if not null / Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY
- var node = this.elem.getElementsByTagName( this.event )[0];
+ var node = this.elem.getElementsByTagName( this.event ).item(0);
this.getNode().removeChild( node );
}
Modified: trunk/src/main/javascript/packet/PacketListenerManager.js
===================================================================
--- trunk/src/main/javascript/packet/PacketListenerManager.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/PacketListenerManager.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -63,8 +63,8 @@
wrapper.listener( packetNode );
}
} else {
- for( var j = 0; j < packetNode.childNodes.length; j++ ) {
- var node = packetNode.childNodes[j];
+ for( var j = 0; j < packetNode.childNodes.getLength(); j++ ) {
+ var node = packetNode.childNodes.item(j);
// if it's not a normal element ignore it
if( node.nodeType != 1 /* ELEMENT - are there cross-browser constants? */) {
@@ -92,4 +92,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: trunk/src/main/javascript/packet/Presence.js
===================================================================
--- trunk/src/main/javascript/packet/Presence.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/Presence.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -22,7 +22,7 @@
Xmpp4Js.Packet.Presence.prototype = {
getType : function() {
- var type = this.elem.getAttribute( "type" );
+ var type = this.elem.getAttribute( "type" ).toString();
return type ? type : "available";
},
@@ -72,4 +72,4 @@
}
}
-Ext.extend( Xmpp4Js.Packet.Presence, Xmpp4Js.Packet.Base, Xmpp4Js.Packet.Presence.prototype);
\ No newline at end of file
+Ext.extend( Xmpp4Js.Packet.Presence, Xmpp4Js.Packet.Base, Xmpp4Js.Packet.Presence.prototype);
Modified: trunk/src/main/javascript/packet/Registration.js
===================================================================
--- trunk/src/main/javascript/packet/Registration.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packet/Registration.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -13,7 +13,7 @@
for( var k in fields ) {
var child = queryNode.ownerDocument.createElement( k );
- child.textContent = fields[k];
+ child.setTextContent( fields[k] );
queryNode.appendChild( child );
}
@@ -27,4 +27,4 @@
// a way to get result if this is a result packet (registered with stanza provider).
}
-Ext.extend( Xmpp4Js.Packet.Registration, Xmpp4Js.Packet.IQ, Xmpp4Js.Packet.Registration.prototype);
\ No newline at end of file
+Ext.extend( Xmpp4Js.Packet.Registration, Xmpp4Js.Packet.IQ, Xmpp4Js.Packet.Registration.prototype);
Modified: trunk/src/main/javascript/packetfilter/Errors.js
===================================================================
--- trunk/src/main/javascript/packetfilter/Errors.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packetfilter/Errors.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -80,7 +80,7 @@
Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.prototype = {
accept : function(bodyElement) {
- return bodyElement.getAttribute( "type" ) == "terminate" && Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ bodyElement.getAttribute("condition") ] != undefined;
+ return bodyElement.getAttribute( "type" ).toString() == "terminate" && Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ bodyElement.getAttribute("condition").toString() ] != undefined;
}
}
@@ -108,8 +108,8 @@
Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter.prototype = {
accept : function(bodyElement) {
- return bodyElement.getAttribute( "type" ) == "error";
+ return bodyElement.getAttribute( "type" ).toString() == "error";
}
}
-Ext.extend( Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter, Xmpp4Js.PacketFilter.RawPacketFilter, Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter.prototype);
\ No newline at end of file
+Ext.extend( Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter, Xmpp4Js.PacketFilter.RawPacketFilter, Xmpp4Js.PacketFilter.RecoverableErrorPacketFilter.prototype);
Modified: trunk/src/main/javascript/packetfilter/PacketExtensionFilter.js
===================================================================
--- trunk/src/main/javascript/packetfilter/PacketExtensionFilter.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/packetfilter/PacketExtensionFilter.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -16,8 +16,8 @@
// just check child element namespaces.
var node = packet.getNode();
- for( var i = 0; i < node.childNodes.length; i++ ) {
- if( node.childNodes[i].namespaceURI == this.extensionNS ) {
+ for( var i = 0; i < node.childNodes.getLength(); i++ ) {
+ if( node.childNodes.item(i).namespaceURI == this.extensionNS ) {
return true;
}
}
Modified: trunk/src/main/javascript/roster/RosterItemManager.js
===================================================================
--- trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/roster/RosterItemManager.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -149,20 +149,20 @@
*/
rosterPacketListener: function( packet ) {
var itemNodes = packet.getQuery().getElementsByTagName("item");
- for ( var i=0; i < itemNodes.length; i++ ) {
- var item = itemNodes[i];
+ for ( var i=0; i < itemNodes.getLength(); i++ ) {
+ var item = itemNodes.item(i);
- var jid = item.getAttribute( "jid" );
- var name = item.getAttribute( "name" );
- var subscription = item.getAttribute( "subscription" ); // none, to, from, both, remove
- var ask = item.getAttribute( "ask" ); // subscribe, unsubscribe
+ var jid = item.getAttribute( "jid" ).toString();
+ var name = item.getAttribute( "name" ).toString();
+ var subscription = item.getAttribute( "subscription" ).toString(); // none, to, from, both, remove
+ var ask = item.getAttribute( "ask" ).toString(); // subscribe, unsubscribe
var groups = [];
var groupNodes = item.getElementsByTagName("group");
- for( var j = 0; j < groupNodes.length; j++ ) {
- var node = groupNodes[j];
- groups.push( node.textContent );
+ for( var j = 0; j < groupNodes.getLength(); j++ ) {
+ var node = groupNodes.item(j);
+ groups.push( node.getStringValue() );
}
this.update( jid, name, subscription, ask, groups );
@@ -183,7 +183,7 @@
* @param {Xmpp4Js.Packet.IQ} packet Could be class of roster packet.
*/
rosterSubSyncPacketListener: function( presence ) {
- var subsyncNode = presence.getNode().getElementsByTagNameNS("http://jabber.org/protocol/roster-subsync", "x")[0];
+ var subsyncNode = presence.getNode().getElementsByTagNameNS("http://jabber.org/protocol/roster-subsync", "x").item(0);
// TODO create a subsync packet filter.
if( !subsyncNode ) {
return;
@@ -194,19 +194,19 @@
var itemNodes = subsyncNode.getElementsByTagName("item");
- for ( var i=0; i < itemNodes.length; i++ ) {
- var item = itemNodes[i];
+ for ( var i=0; i < itemNodes.getLength(); i++ ) {
+ var item = itemNodes.item(i);
- var name = item.getAttribute( "name" );
- var subscription = item.getAttribute( "subscription" ); // none, to, from, both, remove
- var ask = item.getAttribute( "ask" ); // subscribe, unsubscribe
+ var name = item.getAttribute( "name" ).toString();
+ var subscription = item.getAttribute( "subscription" ).toString(); // none, to, from, both, remove
+ var ask = item.getAttribute( "ask" ).toString(); // subscribe, unsubscribe
var groups = [];
var groupNodes = item.getElementsByTagName("group");
- for( var j = 0; j < groupNodes.length; j++ ) {
- var node = groupNodes[j];
- groups.push( node.textContent );
+ for( var j = 0; j < groupNodes.getLength(); j++ ) {
+ var node = groupNodes.item(j);
+ groups.push( node.getStringValue() );
}
this.update( jid, name, subscription, ask, groups );
Modified: trunk/src/main/javascript/roster/RosterPacket.js
===================================================================
--- trunk/src/main/javascript/roster/RosterPacket.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/roster/RosterPacket.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -33,7 +33,7 @@
var group = groups[i];
var groupNode = item.appendChild( doc.createElement( "group" ) );
groupNode.setAttribute( "xmlns", "jabber:iq:roster" );
- groupNode.textContent = group;
+ groupNode.setTextContent( group );
}
}
}
@@ -48,6 +48,6 @@
if( !Xmpp4Js.Packet.StanzaProvider.IQProvider( stanzaNode ) ) {
return false;
}
- var queryNode = stanzaNode.getElementsByTagName("query" )[0];
- return queryNode !== undefined && queryNode.namespaceURI == "jabber:iq:roster";
+ var queryNode = stanzaNode.getElementsByTagName("query" ).item(0);
+ return queryNode != undefined && queryNode.namespaceURI == "jabber:iq:roster";
}
Modified: trunk/src/main/javascript/transport/BOSH.js
===================================================================
--- trunk/src/main/javascript/transport/BOSH.js 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/main/javascript/transport/BOSH.js 2008-02-23 09:50:46 UTC (rev 696)
@@ -271,11 +271,11 @@
//this.un("recv", arguments.callee /* the current function */, this );
- this.sid = packetNode.getAttribute( "sid" );
- this.maxRequests = packetNode.getAttribute( "requests" );
+ this.sid = packetNode.getAttribute( "sid" ).toString();
+ this.maxRequests = packetNode.getAttribute( "requests" ).toString();
if( packetNode.hasAttribute("hold") ) {
- this.hold = packetNode.getAttribute("hold");
+ this.hold = packetNode.getAttribute("hold").toString();
} else {
// sensible default
this.hold = packetNode.maxRequests - 1;
@@ -283,7 +283,7 @@
if( packetNode.hasAttribute("wait") ) {
// FIXME ideally xhr's timeout should be updated
- this.wait = packetNode.getAttribute("wait");
+ this.wait = packetNode.getAttribute("wait").toString();
}
this.startup();
@@ -355,7 +355,7 @@
this.addFrameData( packetNode );
- var xml = serializeNode(packetNode);
+ var xml = packetNode.toString();
this.fireEvent( "write", packetNode );
@@ -380,7 +380,7 @@
var packetNode = null;
- if( response.responseXML != null ) {
+ if( response.responseText != null ) {
// 17.4 XML Stanza Conditions?
// this condition would be true if we closed the connection
// before a response was received
@@ -390,7 +390,7 @@
// inturruption before the server responded. figure out
// how to handle this.
- packetNode = response.responseXML.documentElement;
+ packetNode = new DOMImplementation().loadXML( response.responseText ).documentElement;
}
/*
@@ -417,7 +417,7 @@
var condition = null;
if( packetNode != null ) {
- condition = packetNode.getAttribute( "condition" );
+ condition = packetNode.getAttribute( "condition" ).toString();
} else if( !response.status ) {
condition = "undefined-condition";
} else if( response.status != 200 ){
@@ -430,7 +430,7 @@
var message = Xmpp4Js.PacketFilter.TerminalErrorPacketFilter.conditions[ condition ].message;
this.fireEvent( "termerror", title, message, packetNode );
- } else if( packetNode.getAttribute("type") == "error" ) {
+ } else if( packetNode.getAttribute("type").toString() == "error" ) {
// 17.3 Recoverable Binding Conditions
// TODO this should attempt to resend all packets back
@@ -571,4 +571,4 @@
}
}
-Ext.extend( Xmpp4Js.Transport.BOSH, Ext.util.Observable, Xmpp4Js.Transport.BOSH.prototype );
\ No newline at end of file
+Ext.extend( Xmpp4Js.Transport.BOSH, Ext.util.Observable, Xmpp4Js.Transport.BOSH.prototype );
Modified: trunk/src/test/javascript/BOSHTransportTest.html
===================================================================
--- trunk/src/test/javascript/BOSHTransportTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/BOSHTransportTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -37,14 +37,14 @@
// make sure that txPacket is an Element
assertNotUndefined( "txPacket was empty", txPacket );
- assertTrue( "txPacket was not an element.", txPacket instanceof Element );
+ assertTrue( "txPacket was not an element.", txPacket instanceof DOMElement );
// make sure we are adding attributes to raw packets
- assertEquals( "txPacket did not have correct wait", bosh.wait, txPacket.getAttribute( "wait" ) );
- assertEquals( "txPacket did not have correct to", bosh.domain, txPacket.getAttribute( "to" ) );
+ assertEquals( "txPacket did not have correct wait", bosh.wait, txPacket.getAttribute( "wait" ).toString() );
+ assertEquals( "txPacket did not have correct to", bosh.domain, txPacket.getAttribute( "to" ).toString() );
- assertEquals( "txPacket did not have correct BOSH version", "1.6", txPacket.getAttribute( "ver" ) );
- assertEquals( "txPacket did not have correct xmpp version", "1.0", txPacket.getAttribute( "xmpp:version" ) );
+ assertEquals( "txPacket did not have correct BOSH version", "1.6", txPacket.getAttribute( "ver" ).toString() );
+ assertEquals( "txPacket did not have correct xmpp version", "1.0", txPacket.getAttribute( "xmpp:version" ).toString() );
assertTrue( "txPacket did not have a route", txPacket.hasAttribute( "route" ) );
assertTrue( "txPacket does not have a rid", txPacket.hasAttribute( "rid" ) );
@@ -59,7 +59,8 @@
var packet = packetHelper.createPacket();
var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
- packet.appendChild( iq.getNode() );
+ var node = packet.ownerDocument.importNode( iq.getNode(), true );
+ packet.appendChild( node );
// setup variable to be caught on tx
var txPacket = undefined;
@@ -76,7 +77,7 @@
// make sure that txPacket is an Element
assertNotUndefined( "txPacket was empty", txPacket );
- assertTrue( "txPacket was not an element.", txPacket instanceof Element );
+ assertTrue( "txPacket was not an element.", txPacket instanceof DOMElement );
// make sure we are adding attributes to raw packets
assertTrue( "txPacket did not have an RID", txPacket.hasAttribute( "rid" ) );
@@ -90,7 +91,8 @@
var packet = packetHelper.createPacket();
var iq = packetHelper.createIQ( "te...@te...", "set", "jabber:iq:roster" );
- packet.appendChild( iq.getNode() );
+ var node = packet.ownerDocument.importNode( iq.getNode(), true );
+ packet.appendChild( node );
bosh.beginSession();
@@ -99,7 +101,7 @@
var inititalRid = null;
bosh.on( "write", function(packetNode) {
- inititalRid = parseInt(packetNode.getAttribute( "rid" ));
+ inititalRid = parseInt(packetNode.getAttribute( "rid" ).toString());
}, this, {single:true});
bosh.write( packet );
@@ -108,7 +110,7 @@
var nextRid = null;
bosh.on( "write", function(packetNode) {
- nextRid = parseInt(packetNode.getAttribute( "rid" ));
+ nextRid = parseInt(packetNode.getAttribute( "rid" ).toString());
}, this);
bosh.write( packet );
Modified: trunk/src/test/javascript/ChatManagerTest.html
===================================================================
--- trunk/src/test/javascript/ChatManagerTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/ChatManagerTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -139,15 +139,13 @@
function testReceiveMessage_Event() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
var wasInvoked = false;
- var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, collector) {
+ var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, msg) {
wasInvoked = true;
- var msg = collector.pollResult();
-
assertNotUndefined( msg );
assertEquals( THREAD_ID, msg.getThread() );
assertEquals( "te...@te...", msg.getFrom() );
@@ -162,15 +160,13 @@
function testReceiveMessage_Event_Two() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
var invokationCount = 0;
- var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, collector) {
+ var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, msg) {
invokationCount++;
- var msg = collector.pollResult();
-
assertNotUndefined( msg );
assertEquals( THREAD_ID, msg.getThread() );
assertEquals( "te...@te...", msg.getFrom() );
@@ -186,16 +182,14 @@
function testReceiveMessage_Event_New() {
var packet = loadTestPacket( "packets/incoming_message_chat.xml" );
- var stanzaNode = packet.getElementsByTagName("message" )[0];
+ var stanzaNode = packet.getElementsByTagName("message" ).item(0);
var invokationCount = 0;
- var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, collector) {
+ var chat = chatMan.createChat( "te...@te...", THREAD_ID, function(chat, msg) {
invokationCount++;
- var msg = collector.pollResult();
-
assertNotUndefined( msg );
assertEquals( THREAD_ID, msg.getThread() );
assertEquals( "te...@te...", msg.getFrom() );
Modified: trunk/src/test/javascript/DomBuilderTest.html
===================================================================
--- trunk/src/test/javascript/DomBuilderTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/DomBuilderTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -28,44 +28,44 @@
function testElementName() {
var elem = DomBuilder.node( ELEM_NAME );
- assertEquals( ELEM_NAME, elem.localName );
+ assertEquals( ELEM_NAME, elem.nodeName );
}
function testAttributes() {
var elem = DomBuilder.node( ELEM_NAME, {"attr1": TEXT} );
assertTrue( elem.hasAttribute( "attr1" ) );
- assertEquals( TEXT, elem.getAttribute( "attr1" ) );
+ assertEquals( TEXT, elem.getAttribute( "attr1" ).toString() );
}
function testChildNodes() {
var childNode = DomBuilder.node(ELEM_NAME);
var elem = DomBuilder.node( ELEM_NAME, undefined, [childNode] );
- assertEquals( 1, elem.childNodes.length );
- assertEquals( childNode, elem.childNodes[0] );
+ assertEquals( 1, elem.childNodes.getLength() );
+ assertEquals( childNode, elem.childNodes.item(0) );
}
function testTextContent() {
var elem = DomBuilder.node( ELEM_NAME, undefined, undefined, TEXT );
- assertEquals( 1, elem.childNodes.length );
+ assertEquals( 1, elem.childNodes.getLength() );
- var textNode = elem.childNodes[0];
+ var textNode = elem.childNodes.item(0);
assertEquals( NODETYPE_TEXT, textNode.nodeType );
- assertEquals( TEXT, textNode.textContent );
+ assertEquals( TEXT, textNode.getStringValue() );
}
function testChildNodesAndTextContent() {
var childNode = DomBuilder.node(ELEM_NAME);
var elem = DomBuilder.node( ELEM_NAME, undefined, [childNode], TEXT );
- assertEquals( 2, elem.childNodes.length );
- assertEquals( childNode, elem.childNodes[0] );
+ assertEquals( 2, elem.childNodes.getLength() );
+ assertEquals( childNode, elem.childNodes.item(0) );
- var textNode = elem.childNodes[1];
+ var textNode = elem.childNodes.item(1);
assertEquals( NODETYPE_TEXT, textNode.nodeType );
- assertEquals( TEXT, textNode.textContent );
+ assertEquals( TEXT, textNode.getStringValue() );
}
function testParentDoc() {
Modified: trunk/src/test/javascript/DomHacksTest.html
===================================================================
--- trunk/src/test/javascript/DomHacksTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/DomHacksTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -17,15 +17,15 @@
function tearDown() {
}
-function testCreateDocument() {
- var doc = createDocument();
- assertTrue( doc instanceof Document );
-
- var doc2 = createDocument();
- assertTrue( doc instanceof Document );
-
- assertNotEquals( doc, doc2 );
-}
+//function testCreateDocument() {
+// var doc = createDocument();
+// assertTrue( doc instanceof Document );
+//
+// var doc2 = createDocument();
+// assertTrue( doc instanceof Document );
+//
+// assertNotEquals( doc, doc2 );
+//}
// TODO test deep imports.
function testImportNode() {
@@ -34,37 +34,37 @@
var elem = doc.createElement( "div" );
- var elem2 = importNode( doc2, elem, true );
+ var elem2 = doc2.importNode( elem, true );
- assertTrue( elem2 instanceof Element );
+ assertTrue( elem2 instanceof DOMElement );
// jsunit bug?
//assertObjectEquals( elem2.ownerDocument, doc2 );
assertNotEquals( elem, elem2 );
}
-function testParseXmlToDoc() {
- var xml = '<iq type="get"><query xmlns="jabber:iq:version"/></iq>';
+//function testParseXmlToDoc() {
+// var xml = '<iq type="get"><query xmlns="jabber:iq:version"/></iq>';
+//
+// var doc = parseXmlToDoc( xml );
+//
+// assertTrue( doc instanceof Document );
+// assertEquals( "iq", doc.documentElement.nodeName );
+// assertEquals( "query", doc.documentElement.firstChild.nodeName );
+// assertEquals( "jabber:iq:version", doc.documentElement.firstChild.namespaceURI );
+//
+//}
- var doc = parseXmlToDoc( xml );
-
- assertTrue( doc instanceof Document );
- assertEquals( "iq", doc.documentElement.nodeName );
- assertEquals( "query", doc.documentElement.firstChild.nodeName );
- assertEquals( "jabber:iq:version", doc.documentElement.firstChild.namespaceURI );
+//function testSerializeXml() {
+// var xml = '<iq type="get"><query xmlns="jabber:iq:version"/></iq>';
+//
+// var doc = parseXmlToDoc( xml );
+//
+// var outXml = serializeNode( doc.documentElement );
+//
+// assertEquals( xml, outXml );
+//}
-}
-function testSerializeXml() {
- var xml = '<iq type="get"><query xmlns="jabber:iq:version"/></iq>';
-
- var doc = parseXmlToDoc( xml );
-
- var outXml = serializeNode( doc.documentElement );
-
- assertEquals( xml, outXml );
-}
-
-
</script>
</body>
</html>
Modified: trunk/src/test/javascript/ExtensionProviderTest.html
===================================================================
--- trunk/src/test/javascript/ExtensionProviderTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/ExtensionProviderTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -37,9 +37,9 @@
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "composing", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "composing", children.item(0).firstChild.nodeName );
}
function testMessageEvent_Multiple() {
@@ -49,9 +49,9 @@
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "pooping", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "pooping", children.item(0).firstChild.nodeName );
}
function testMessageEvent_Empty() {
@@ -60,23 +60,23 @@
// test empty event constructor
var children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 0, children[0].childNodes.length );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 0, children.item(0).childNodes.length );
assertEquals( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY, msgEvent.getEvent() );
// set an event and make sure all is well
msgEvent.setEvent( "composing" );
children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 1, children[0].childNodes.length );
- assertEquals( "composing", children[0].firstChild.nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 1, children.item(0).childNodes.length );
+ assertEquals( "composing", children.item(0).firstChild.nodeName );
assertEquals( "composing", msgEvent.getEvent() );
// then set event back and make sure we'll still good
msgEvent.setEvent( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY );
children = msg.getNode().getElementsByTagNameNS( msgEvent.getElementNS(), msgEvent.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( 0, children[0].childNodes.length );
+ assertEquals( 1, children.getLength() );
+ assertEquals( 0, children.item(0).childNodes.length );
assertEquals( Xmpp4Js.Ext.MessageEvent.EVENT_EMPTY, msgEvent.getEvent() );
}
@@ -88,8 +88,8 @@
var children = msg.getNode().getElementsByTagNameNS( chatState.getElementNS(), chatState.getElementName() );
- assertEquals( 1, children.length );
- assertEquals( "active", children[0].nodeName );
+ assertEquals( 1, children.getLength() );
+ assertEquals( "active", children.item(0).nodeName );
}
function testChatState_Multiple() {
@@ -100,10 +100,10 @@
assertEquals( "away", chatState.getElementName() );
var children = msg.getNode().getElementsByTagNameNS( chatState.getElementNS(), chatState.getElementName() );
- assertEquals( 1, children.length );
+ assertEquals( 1, children.getLength() );
var oldChildren = msg.getNode().getElementsByTagNameNS( "active", chatState.getElementName() );
- assertEquals( 0, oldChildren.length );
+ assertEquals( 0, oldChildren.getLength() );
}
function testPacket_GetExtension() {
@@ -224,7 +224,7 @@
assertUndefined( chatState );
var children = msg.getNode().getElementsByTagNameNS( Xmpp4Js.Ext.ChatStates.XMLNS, "active" );
- assertEquals( 0, children.length );
+ assertEquals( 0, children.getLength() );
}
function BROKEN_testErrorExtension_PacketDefaultNS() {
Modified: trunk/src/test/javascript/MUC_FilterTest.html
===================================================================
--- trunk/src/test/javascript/MUC_FilterTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/MUC_FilterTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -23,7 +23,7 @@
function testMucPresenceFilter_NoRoom_True() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
var pf = new Xmpp4Js.Muc.MucPresenceFilter();
@@ -35,7 +35,7 @@
function testMucPresenceFilter_NoRoom_False_WrongNS() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "WRONG http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "WRONG http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
@@ -48,7 +48,7 @@
function testMucPresenceFilter_Room_True() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
@@ -61,7 +61,7 @@
function testMucPresenceFilter_Room_False() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "WRONG http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "WRONG http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
@@ -74,7 +74,7 @@
function testMucPresenceFilter_Occupant_True() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
@@ -87,7 +87,7 @@
function testMucPresenceFilter_Occupant_False() {
var pres = new Xmpp4Js.Packet.Presence(undefined, "som...@so...", undefined, undefined, undefined);
pres.setFrom( "on...@co.../firstwitch" );
- var node = createElementNS( pres.getNode().ownerDocument, "WRONG http://jabber.org/protocol/muc#user", "x");
+ var node = pres.getNode().ownerDocument.createElementNS( "WRONG http://jabber.org/protocol/muc#user", "x");
pres.getNode().appendChild( node );
Modified: trunk/src/test/javascript/MUC_JoinTest.html
===================================================================
--- trunk/src/test/javascript/MUC_JoinTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/MUC_JoinTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -49,8 +49,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "packets/muc_roomlist.xml", function(packet) {
- packet.getElementsByTagName("iq" )[0].setAttribute( "id", txPacket.getElementsByTagName("iq" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("iq" )[0].setAttribute( "from", txPacket.getElementsByTagName("iq" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("iq" ).item(0).setAttribute( "id", txPacket.getElementsByTagName("iq" ).item(0).getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("iq" ).item(0).setAttribute( "from", txPacket.getElementsByTagName("iq" ).item(0).getAttribute( "to" ).toString() );
});
});
@@ -139,8 +139,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
@@ -185,8 +185,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join_conflictingnick.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
@@ -219,8 +219,8 @@
// make a fake response
options.responsePacket = loadTestPacket( "file://C:/Documents and Settings/Harlan/My Documents/NetBeansProjects/xmpp4js/trunk/target/jsunit/packets/muc_join_roomfull.xml", function(packet) {
- packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ) );
- packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ) );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "id", txPacket.getElementsByTagName("presence" )[0].getAttribute( "id" ).toString() );
+ packet.getElementsByTagName("presence" )[0].setAttribute( "from", txPacket.getElementsByTagName("presence" )[0].getAttribute( "to" ).toString() );
});
});
Modified: trunk/src/test/javascript/PacketFilterTest.html
===================================================================
--- trunk/src/test/javascript/PacketFilterTest.html 2008-02-23 07:20:28 UTC (rev 695)
+++ trunk/src/test/javascript/PacketFilterTest.html 2008-02-23 09:50:46 UTC (rev 696)
@@ -26,7 +26,7 @@
var pf = new Xmpp4Js.PacketFilter.RawPacketFilter();
var packet = DomBuilder.node( "body", {xmlns: "http://jabber.org/protocol/httpbind"} );
- var stanzaNode = packet.getElementsByTagName("iq" )[0];
+ var stanzaNode = packet.getElementsByTagName("iq" ).item(0);
// RawPacket filters are special and take packet rather than stanza.
var result = pf.accept( packet );
Modifie...
[truncated message content] |
