Mercurial > eldonilo > lightstring

comparison lightstring.js @ 28:630b9579fe4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge fixing
author Sonny Piers <sonny.piers@gmail.com>
date Sat, 28 Jan 2012 01:34:32 +0100
parents b6e4bc19ff5a
children 1e6d2ca2daae 88d24231bf24
comparison
equal deleted inserted replaced
27:b6e4bc19ff5a 28:630b9579fe4a
267 that.emit('XMLInput', e.data); 267 that.emit('XMLInput', e.data);
268 var elm = Lightstring.xml2dom(e.data); 268 var elm = Lightstring.xml2dom(e.data);
269 that.emit('DOMInput', elm); 269 that.emit('DOMInput', elm);
270 that.emit(elm.tagName, elm); 270 that.emit(elm.tagName, elm);
271 271
272 <<<<<<< HEAD
273 if (elm.tagName === 'iq')
274 that.emit(elm.getAttribute('id'), elm);
275 =======
276 if (elm.tagName === 'iq') { 272 if (elm.tagName === 'iq') {
277 var payload = elm.firstChild; 273 var payload = elm.firstChild;
278 if (payload) 274 if (payload)
279 that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, elm); 275 that.emit('iq/' + payload.namespaceURI + ':' + payload.localName, elm);
280 that.emit(elm.getAttribute('id'), elm); //FIXME: possible attack vector. 276 that.emit(elm.getAttribute('id'), elm); //FIXME: possible attack vector.
281 } 277 }
282 >>>>>>> f6a7c0f93d154c2cd34dfdda4ab8eec808b91b34
283 }); 278 });
284 }, 279 },
285 /** 280 /**
286 * @function Send a message. 281 * @function Send a message.
287 * @param {String|Object} aStanza The message to send. 282 * @param {String|Object} aStanza The message to send.