Permalink
Browse files

Merge remote-tracking branch 'metajack/master'

  • Loading branch information...
flosse committed Jan 12, 2013
2 parents 256726f + df5201d commit ec070434ee59b4cca413323dc70473447b0b80eb
Showing with 940 additions and 945 deletions.
  1. +1 −1 mam/strophe.mam.js
  2. +5 −2 muc/strophe.muc.coffee
  3. +933 −941 muc/strophe.muc.js
  4. +1 −1 vcard/strophe.vcard.coffee
View
@@ -22,7 +22,7 @@ init:
query:
function(jid, options) {
var _p = this._p;
- var attr = {type:"get"};
+ var attr = {type:"get",to:jid};
var mamAttr = {xmlns: Strophe.NS.MAM};
var iq = $iq(attr).c("query", mamAttr);
for (i=0; i < this._p.length; i++) {
View
@@ -37,13 +37,16 @@ Strophe.addConnectionPlugin 'muc'
(String) password - The optional password to use. (password protected
rooms only)
###
- join: (room, nick, msg_handler_cb, pres_handler_cb, roster_cb, password) ->
+ join: (room, nick, msg_handler_cb, pres_handler_cb, roster_cb, password, history_attrs) ->
room_nick = @test_append_nick(room, nick)
msg = $pres(
from: @_connection.jid
to: room_nick )
.c("x", xmlns: Strophe.NS.MUC)
+ if history_attrs?
+ msg = msg.c("history", history_attrs)
+
if password?
msg.cnode Strophe.xmlElement("password", [], password)
@@ -153,7 +156,7 @@ Strophe.addConnectionPlugin 'muc'
if html_message?
msg.c("html", xmlns: Strophe.NS.XHTML_IM)
.c("body", xmlns: Strophe.NS.XHTML)
- .h(html_message)
+ .t(html_message)
if msg.node.childNodes.length is 0
# html creation or import failed somewhere; fallback to plaintext
parent = msg.node.parentNode
Oops, something went wrong.

0 comments on commit ec07043

Please sign in to comment.