@@ -8,10 +8,7 @@

 #= require _main

 #= require chat

-#aa = new Xmpp.Views.Popup.NewAccountView()

-#aa.render();

-

-App.Com.connect( (connected_jid) ->

+App.Com.connect( ->

   App.Com.initRoster(->

     App.Com.startFetchingVcards()

     App.Com.startPollingRoster()

@@ -1 +1,3 @@

-%a.close.icon-x{ alt: "#{I18n.t('chat.close')}", href: '#' }

\ No newline at end of file

+.popup{ class: "#{@class}" }

+  %a.close.icon-x{ alt: "#{I18n.t('chat.close')}", href: '#' }

+  #{@inside}

\ No newline at end of file

@@ -2,18 +2,42 @@ Xmpp.Views.Popup ||= {}

 class Xmpp.Views.Popup.PopupView extends Backbone.View

   superTemplate: JST["backbone/templates/popup/popup"]

-  el: $('#js-popup')

+  el: $('#js-popups')

-  superEvents:

-    'click .close': 'close'

+  @popups = {}

+

+  constructor: ->

+    super

+    PopupView.popups[@cid] = this

+

+  superEvents: ->

+    result = {}

+    result["click .#{@className} .close"] = 'close'

+    result

   render: (childHtml) ->

-    $(@el).html(@superTemplate()).append(childHtml)

+    $(@el).find('.popup').hide()

+    _.each(PopupView.popups, (view) ->

+      view.undelegateEvents()

+    )

+

+    thisView = PopupView.popups[@cid]

+    thisView.delegateEvents()

+

+    $(@el).append(@superTemplate(inside: childHtml, class: @className))

   close: (e) ->

     e.preventDefault()

-    @remove()

+    @remove(e)

-  remove: ->

+  remove: (e) ->

     @stopListening()

-    $(@el).empty()

\ No newline at end of file

+    @undelegateEvents()

+    $(e.currentTarget).closest('.popup').remove()

+

+    delete PopupView.popups[@cid]

+

+    firstFoundView = _.find(PopupView.popups, (view) -> view) # najde prvy view

+    if firstFoundView

+      $(@el).find('.popup').first().show()

+      firstFoundView.delegateEvents()

\ No newline at end of file

@@ -2,12 +2,13 @@ Xmpp.Views.Popup ||= {}

 class Xmpp.Views.Popup.AddContactView extends Xmpp.Views.Popup.PopupView

   template: JST["backbone/templates/popup/add_contact"]

+  className: 'add-contact'

   events:

     'submit form': 'addContact'

   initialize: ->

-    @events = _.extend(@events, @superEvents)

+    @events = _.extend(@events, @superEvents())

   render: ->

     super(@template())

@@ -2,6 +2,7 @@ Xmpp.Views.Popup ||= {}

 class Xmpp.Views.Popup.FriendRequestView extends Xmpp.Views.Popup.PopupView

   template: JST["backbone/templates/popup/friend_request"]

+  className: 'friend-reqeust'

   events:

     'submit form': 'approve'

@@ -10,22 +11,21 @@ class Xmpp.Views.Popup.FriendRequestView extends Xmpp.Views.Popup.PopupView

     @name = options.name

     @jid  = options.jid

-    @events = _.extend(@events, @superEvents)

+    @events = _.extend(@events, @superEvents())

   render: ->

     super(@template(new_contact: @name))

     $(@el).css(width: '20%', 'z-index': 999)

-    $(@el).find('input[type=text]').focus()

     this

   approve: (e) ->

     e.preventDefault()

-    App.debug 'approve request'

+    App.debug ['approve request', @jid]

     App.Com.answerFriendRequest(@jid, true)

-    @remove()

+    @remove(e)

   close: (e) ->

     e.preventDefault()

-    App.debug 'cancel request'

+    App.debug ['cancel request', @jid]

     App.Com.answerFriendRequest(@jid, false)

-    @remove()

\ No newline at end of file

+    @remove(e)

\ No newline at end of file

@@ -6,7 +6,7 @@

     I18n.defaultLocale = "#{I18n.default_locale}";

     I18n.locale = "#{I18n.locale}";

-%div.chat-alert.alert-notice.no-top-border#js-popup

+%div.chat-alert.alert-notice.no-top-border#js-popups

 .container

   .leftside.left