From 70295110298dd673858ba93536d28ce713e8fc11 Mon Sep 17 00:00:00 2001
From: Tor Hveem <tor@hveem.no>
Date: Sat, 14 Mar 2015 21:10:19 +0100
Subject: [PATCH] Style the reconnect banner, clean up apply usage

---
 css/glowingbear.css | 8 +++++---
 index.html          | 8 +++++---
 js/connection.js    | 4 +++-
 js/websockets.js    | 1 -
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index bd3e08d..64b4f65 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -267,11 +267,13 @@ td.time {
     top: 35px;
     position: fixed;
     z-index: 9999;
-    background-color: #eee;
-    color: #333;
-    width: 100%;
+    width: 80%;
     margin: 0;
     padding: 5px;
+    left: 10%;
+}
+#reconnect a {
+    color: white;
 }
 
 .footer {
diff --git a/index.html b/index.html
index 8946e3b..adad7ef 100644
--- a/index.html
+++ b/index.html
@@ -289,15 +289,17 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
             </tr>
           </tbody>
         </table><span id="end-of-buffer"></span>
-        <div id="reconnect" ng-if="reconnecting">
-          <i class="glyphicon glyphicon-refresh"></i> Reconnecting... <a ng-click="reconnect()">Try now</a>
-        </div>
       </div>
       <div class="footer" ng-class="{'withnicklist': showNicklist}">
         <div input-bar input-id="sendMessage" command="command"></div>
       </div>
     </div>
     <div id="soundNotification"></div>
+    <div id="reconnect" class="alert alert-danger" ng-click="reconnect()" ng-show="reconnecting">
+        <p><strong>Connection to WeeChat lost</strong></p>
+        <i class="glyphicon glyphicon-refresh"></i>
+        Reconnecting... <a class="btn btn-tiny" ng-click="reconnect()">Click to try to reconnect now</a>
+    </div>
     <div id="settingsModal" class="gb-modal" data-state="hidden">
       <div class="backdrop" ng-click="closeModal($event)"></div>
       <div class="modal-dialog">
diff --git a/js/connection.js b/js/connection.js
index a4552c9..e80c031 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -184,10 +184,10 @@ weechat.factory('connection',
         $log.info('Attempting to reconnect...');
         var d = connectionData;
         connect(d[0], d[1], d[2], d[3], d[4], function() {
+            $rootScope.reconnecting = false;
             // on success, update active buffer
             models.setActiveBuffer(bufferId);
             $log.info('Sucessfully reconnected to relay');
-            $rootScope.reconnecting = false;
         }, function() {
             // on failure, schedule another attempt
             if (timeout >= 600000) {
@@ -217,6 +217,8 @@ weechat.factory('connection',
         }
 
         $rootScope.reconnecting = true;
+        // Have to do this to get the reconnect banner to show
+        $rootScope.$apply();
 
         var bufferId = models.getActiveBuffer().id,
             timeout = 3000;  // start with a three-second timeout
diff --git a/js/websockets.js b/js/websockets.js
index 939b31a..44fb552 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -110,7 +110,6 @@ function($rootScope, $q) {
             $rootScope.$emit('onMessage', message);
         }
 
-        $rootScope.$apply();
     };
 
     var connect = function(url,