From e35d80b18300e950bb280686f6e4470d5794dcb8 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 16 Sep 2014 22:49:15 +0200
Subject: [PATCH] Small modal improvements.

---
 .../_application_controller.js.coffee         | 22 ++++++++++---------
 .../controllers/widget/maintenance.js.coffee  |  2 +-
 .../widget/session_taken_over.js.coffee       |  2 +-
 .../app/lib/app_post/websocket.js.coffee      |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
index 40b32f350..51ba540c4 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
@@ -451,9 +451,9 @@ class App.ControllerModal extends App.Controller
       backdrop: true
       keyboard: true
       close:    true
-      title:    '?'
+      head:     '?'
 
-    options = _.extend( options, defaults )
+    options = _.extend( defaults, options )
 
     # do not use @el, because it's inserted by js
     delete options.el
@@ -476,12 +476,17 @@ class App.ControllerModal extends App.Controller
     )
     if content
       @el.find('.modal-body').html content
-    @el.modal('show')
+    @el.modal(
+      keyboard: @keyboard
+      show:     true
+      backdrop: @backdrop
+    )
 
-  modalHide: (e) ->
-    if e
-      e.preventDefault()
-    @el.modal('hide')
+    @el.bind('hidden.bs.modal', =>
+      @onHide()
+      # remove modal from dom
+      $('.modal').remove();
+    )
 
   hide: (e) ->
     if e
@@ -508,9 +513,6 @@ class App.ErrorModal extends App.ControllerModal
 class App.SessionMessage extends App.ControllerModal
   constructor: ->
     super
-
-    console.log('SM', @)
-
     @show()
 
   # reload page on modal hidden
diff --git a/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee b/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
index 3f147dd0c..384b5f623 100644
--- a/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
+++ b/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
@@ -19,7 +19,7 @@ class Widget extends App.Controller
     new App.SessionMessage(
       head:        message.head
       message:     message.message
-      keyboard:    false
+      keyboard:    true
       backdrop:    true
       close:       true
       button:      button
diff --git a/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee b/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
index 6c56c3524..477db047e 100644
--- a/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
+++ b/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
@@ -43,7 +43,7 @@ class Widget extends App.Controller
               message:     'Session taken over... please reload page or work with other browser window.'
               keyboard:    false
               backdrop:    true
-              close:       true
+              close:       false
               button:      'Reload application'
               forceReload: true
             )
diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
index 33d257ada..27a3da00b 100644
--- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
+++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
@@ -238,7 +238,7 @@ class _webSocketSingleton extends App.Controller
 
           # show reconnect message
           @error = new App.ControllerModal(
-            title:   'Lost network connection!'
+            head:    'Lost network connection!'
             message: 'Lost network connection to system, trying to reconnect...'
             backdrop: false
             keyboard: false