added missing extended_presence parameter in join function. added bow…

…er_components/ to .gitignore
benlangfeld · Feb 27, 2015 · dd7ca8c · dd7ca8c
1 parent 9cddcca
commit dd7ca8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.min.js
+bower_components/
 doc/
 ndproj/
 node_modules

diff --git a/muc/strophe.muc.coffee b/muc/strophe.muc.coffee
@@ -42,7 +42,7 @@ Strophe.addConnectionPlugin 'muc',
   (Object) history_attrs - Optional attributes for retrieving history
   (XML DOM Element) extended_presence - Optional XML for extending presence
   ###
-  join: (room, nick, msg_handler_cb, pres_handler_cb, roster_cb, password, history_attrs) ->
+  join: (room, nick, msg_handler_cb, pres_handler_cb, roster_cb, password, history_attrs, extended_presence) ->
     room_nick = @test_append_nick(room, nick)
     msg = $pres(
       from: @_connection.jid

diff --git a/muc/strophe.muc.js b/muc/strophe.muc.js