@@ -143,6 +143,9 @@ this.App =

     setHistory: (me, chatId, attendant, state, onSuccess) ->

       App.Com.trigger(event: 'app.chat.setHistorySaving', data: {me: me, chatId: chatId, attendant: attendant, enable: state}, success: onSuccess)

+    loadHistory: (me, chatId, attendant, step, onSuccess) ->

+      App.Com.trigger(event: 'app.chat.loadHistory', data: {me: me, chatId: chatId, attendant: attendant, step: step}, success: onSuccess)

+

     _setupBackboneComponents: ->

       App.Collections.contacts = new Xmpp.Collections.ContactsCollection()

       App.Collections.chats = new Xmpp.Collections.ChatsCollection()

@@ -100,6 +100,5 @@ class Xmpp.Collections.ChatsCollection extends Backbone.Collection

     @activeChat = null

     @models = _.without(@openedChats, chat)

-  createTempContact: (jid) ->

-    newTempContact = new Xmpp.Models.Contact(jid: jid, belongsTo: [App.Models.me])

-    newTempContact

\ No newline at end of file

+  @createTempContact: (jid) ->

+    new Xmpp.Models.Contact(id: jid, jid: jid, belongsTo: [App.Models.me])

\ No newline at end of file

@@ -1,6 +1,6 @@

 .conversation.clear.border

   .history-settings

-    %a.left{href: '#'} #{I18n.t('chat.history.load')}

+    %a.left.load-history{href: '#'} #{I18n.t('chat.history.load')}

     %input.hidden{ type: 'checkbox', name: 'enable-history', value: '1', id: 'ihistory', checked: 'checked'}

     %label.right.action.enabled{ for: 'ihistory' } #{I18n.t('chat.history.disable')}

@@ -7,10 +7,12 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

   maxHistoryLength: 20

   savingHistory: true

+  historyStep: 0

   events:

     'submit #msg-writer': (e) -> @sendMessage(e)

     'change .history-settings input': 'changeHistorySettings'

+    'click .history-settings .load-history': 'loadHistory'

   initialize: (options) ->

     _.bindAll(this)

@@ -18,12 +20,15 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     @tab = options.tab

     chatId = @tab.getChatId()

-    attendant = if not chatId then @tab.getAttendant().getPreferredResource() else null

+    attendant = if not chatId then @tab.getAttendant().get('jid') else null

+

     App.Com.checkSavingHistory(App.Models.me.get('jid'), chatId, attendant, (canSave) =>

       @savingHistory = canSave

       @_changeHistoryVisibly(@savingHistory)

     )

+    @loadHistory()

+

   render: ->

     historyStackHtml = _.map(@historyStack, (view) ->

       view.render().el.outerHTML

@@ -87,11 +92,14 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     @log(messageView)

     Backbone.Events.trigger('resizeWorkspace')

-  log: (view) ->

+  log: (view, isHistoryMessage) ->

     if (@historyStack.length + 1 >= @maxHistoryLength)

       @historyStack = @historyStack.slice(@historyStack.length - @maxHistoryLength + 1)

-    @historyStack.push(view)

+    if not isHistoryMessage? || isHistoryMessage == false

+      @historyStack.push(view)

+    else

+      @historyStack.unshift(view)

   changeHistorySettings: (e) ->

     $input = $(e.currentTarget)

@@ -113,4 +121,29 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

       toDisable = '.enabled'

     $(@el).find(".action#{toEnable}, .current#{toEnable}").show()

-    $(@el).find(".action#{toDisable}, .current#{toDisable}").hide()

\ No newline at end of file

+    $(@el).find(".action#{toDisable}, .current#{toDisable}").hide()

+

+  prependHistoryMessage: (user, date, msg) ->

+    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'))

+    $(@el).find('.messages').prepend(messageView.render().el)

+    @log(messageView, true)

+

+  loadHistory: ->

+    chatId = @tab.getChatId()

+    attendant = if not chatId then @tab.getAttendant().get('jid') else null

+

+    App.Com.loadHistory(App.Models.me.get('jid'), chatId, attendant, @historyStep, (result) =>

+      App.debug result

+

+      _.each(result.history.reverse(), (message) =>

+        jid = App.stripJid(message.from)

+        if App.Models.me.get('jid') == jid

+          contact = App.Models.me

+        else

+          contact = App.Collections.contacts.findByJid(jid) || Xmpp.Collections.ChatsCollection.createTempContact(jid)

+

+        @prependHistoryMessage(contact, new Date(message.created_at), message.message)

+      )

+

+      @historyStep++ unless _.isEmpty(result.history)

+    )

@@ -1,5 +1,7 @@

 class WsChatController < WsController

+    require 'message_builder'

+

     def start_polling_messages

         connection_store[:clients].each do |client|

             client.add_message_callback do |message|

@@ -228,6 +230,19 @@ class WsChatController < WsController

         User.set_history_saving(save, me, attendant, chat_id) && trigger_success

     end

+    def load_history

+        me = message[:me]

+        attendant = message[:attendant]

+        chat_id = message[:chatId]

+        page = message[:step]

+        per_page = 10

+

+        trigger_failure unless find_client(me)

+

+        history = History.page_history(me, attendant || chat_id, page, per_page)

+        trigger_success history: history

+    end

+

     private

     def process_incoming_message(from, me, body, chat_id = nil)

@@ -24,4 +24,19 @@ class History

         history.save

     end

+

+    def self.page_history(me, with, page, per_page)

+        # Aggregation DSL: WIP (https://github.com/mongoid/origin/pull/59)

+        History.collection.aggregate([

+            {'$match' => {me: me, _with: with}},

+            {'$limit' => 1},

+            {'$project' => {:messages => 1}},

+            {'$unwind' => '$messages'},

+            {'$sort' => {'messages.created_at' => -1}},

+            {'$skip' => page * per_page},

+            {'$limit' => per_page},

+            {'$sort' => {'messages.created_at' => 1}},

+            {'$project' => {message: '$messages.message', from: '$messages.from', created_at: '$messages.created_at'}}

+        ])

+    end

 end

@@ -72,6 +72,7 @@ WebsocketRails::EventMap.describe do

             subscribe :switchOwnership,       to: WsChatController, with_method: :switch_ownership

             subscribe :canSaveHistory,        to: WsChatController, with_method: :can_save_conversation?

             subscribe :setHistorySaving,      to: WsChatController, with_method: :set_history_saving

+            subscribe :loadHistory,           to: WsChatController, with_method: :load_history

         end

     end

 end