@@ -59,13 +59,16 @@ this.App =

         )

       )

-    sendMessage: (message, chatId, from, callbackOk, callbackFail) ->

+    sendMessage: (message, to, from, callbackOk, callbackFail) ->

+      App.Com.trigger(event: 'app.chat.sendMessage', data: {message: message, to: to, from: from}, success: callbackOk, error: callbackFail)

+

+    sendMultiMessage: sendMessage: (message, chatId, from, callbackOk, callbackFail) ->

       App.Com.trigger(event: 'app.chat.sendMessage', data: {message: message, chatId: chatId, from: from}, success: callbackOk, error: callbackFail)

-    openNewChatId: (chatOwner, attendant, chat) ->

-      @trigger(event: 'app.chat.newChatId', data: {chatOwner: chatOwner}, success: (response) =>

+    openNewMultiChatId: (chatOwner, attendant, chat) ->

+      @trigger(event: 'app.chat.newMultiChatId', data: {chatOwner: chatOwner}, success: (response) =>

         chat.setChatId(response.id)

-        @trigger(event: 'app.chat.addToChat', data: {chatOwner: chatOwner, chatId: response.id, jid: attendant} )

+        @trigger(event: 'app.chat.addToMultiChat', data: {chatOwner: chatOwner, chatId: response.id, jid: attendant} )

       )

     updateMyStatus: (message, state)->

@@ -9,7 +9,7 @@ class Xmpp.Models.Chat extends Xmpp.Models.Model

   initialize: ->

     _.bindAll(this)

-    App.Com.openNewChatId(@get('who').get('jid'), @get('withWhom').get('jid'), this)

+    #App.Com.openNewMultiChatId(@get('who').get('jid'), @get('withWhom').get('jid'), this)

   setChatId: (id) ->

     App.debug ['chat has id', id]

@@ -17,7 +17,10 @@ class Xmpp.Models.Me extends Xmpp.Models.Contact

     @view = new Xmpp.Views.Contacts.MeView(model: this)

     @view.render()

-  sendMessage: (message, chatId, callbackOk, callbackFail) ->

+  sendMessage: (message, chatId, to, callbackOk, callbackFail) ->

     App.debug ['sending from:', @get('jid'), message]

-    App.Com.sendMessage(message, chatId, @get('jid'), callbackOk, callbackFail)

\ No newline at end of file

+    if (! chatId)

+      App.Com.sendMessage(message, to, @get('jid'), callbackOk, callbackFail)

+    else

+      App.Com.sendMultiMessage(message, chatId, @get('jid'), callbackOk, callbackFail)

\ No newline at end of file

@@ -51,7 +51,8 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     input.val('').focus()

     if (message)

-      @tab.getOwner().sendMessage(message, @tab.getChatId()

+      attendant = @tab.getAttendant().get('jid')

+      @tab.getOwner().sendMessage(message, @tab.getChatId(), attendant

       , (message) =>

         @sendSuccess(@tab.getOwner(), message)

       , (message) ->

@@ -63,4 +63,7 @@ class Xmpp.Views.Tabbar.TabView extends Backbone.View

     @model.get('who')

   getChatId: ->

-    @model.get('chatId')

\ No newline at end of file

+    @model.get('chatId')

+

+  getAttendant: ->

+    @model.get('withWhom')

\ No newline at end of file

@@ -23,7 +23,7 @@ class WsChatController < WsController

         end

     end

-    def open_chat

+    def open_multichat

         id = Time.now.to_f

         me = message[:chatOwner]

         client = find_client(me)

@@ -49,7 +49,7 @@ class WsChatController < WsController

         client = find_client(me)

         if client

-            messages = build_messages(message[:message], client, message[:chatId])

+            messages = build_messages(message[:message], client, message[:chatId], message[:to])

             # Xmpp4r doesn't support XEP-0033 (multicast messages)

             messages.each do |message|

@@ -64,9 +64,10 @@ class WsChatController < WsController

     private

-    def build_messages(message, client_from, chat_id)

+    def build_messages(message, client_from, chat_id, jid_to)

         from = client_from.jid.to_s

-        attendants = connection_store[:opened_chats][client_from][chat_id]

+

+        attendants = chat_id ? connection_store[:opened_chats][client_from][chat_id] : [jid_to]

         attendants.map do |person|

             message = Jabber::Message.new(person, message)

@@ -60,8 +60,8 @@ WebsocketRails::EventMap.describe do

         end

         namespace :chat do

-            subscribe :newChatId,           to: WsChatController, with_method: :open_chat

-            subscribe :addToChat,           to: WsChatController, with_method: :add_to_chat

+            subscribe :newMultiChatId,      to: WsChatController, with_method: :open_multichat

+            subscribe :addToMultiChat,      to: WsChatController, with_method: :add_to_multichat

             subscribe :sendMessage,         to: WsChatController, with_method: :send_chat_message

             subscribe :startPollingMessages,to: WsChatController, with_method: :start_polling_messages

         end