From 849da1b5a240ce88d5be473c83242303e2958dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 18 Oct 2014 12:25:14 +0200 Subject: [PATCH 01/13] Implement reconnecting upon connection loss TODO: test in various conditions --- css/glowingbear.css | 11 ++++++ index.html | 3 ++ js/connection.js | 88 +++++++++++++++++++++++++++++++++++++-------- js/glowingbear.js | 6 ++++ js/handlers.js | 50 +++++++++++++++++++++++++- 5 files changed, 142 insertions(+), 16 deletions(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index d171615..2888d13 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -263,6 +263,17 @@ td.time { font-family: sans-serif; } +#reconnect { + top: 35px; + position: fixed; + z-index: 9999; + background-color: #eee; + color: #333; + width: 100%; + margin: 0; + padding: 5px; +} + .footer { position: fixed; bottom: 0; diff --git a/index.html b/index.html index 4ef87ee..e1700ec 100644 --- a/index.html +++ b/index.html @@ -285,6 +285,9 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel +
+ Reconnecting... Try now +
diff --git a/js/connection.js b/js/connection.js index 5c2eb06..a4552c9 100644 --- a/js/connection.js +++ b/js/connection.js @@ -12,9 +12,12 @@ weechat.factory('connection', var protocol = new weeChat.Protocol(); - // Takes care of the connection and websocket hooks + var connectionData = []; + var reconnectTimer; - var connect = function (host, port, passwd, ssl, noCompression) { + // Takes care of the connection and websocket hooks + var connect = function (host, port, passwd, ssl, noCompression, successCallback, failCallback) { + connectionData = [host, port, passwd, ssl, noCompression]; var proto = ssl ? 'wss' : 'ws'; // If host is an IPv6 literal wrap it in brackets if (host.indexOf(":") !== -1) { @@ -79,21 +82,15 @@ weechat.factory('connection', // Connection is successful // Send all the other commands required for initialization _requestBufferInfos().then(function(bufinfo) { - //XXX move to handlers? - var bufferInfos = bufinfo.objects[0].content; - // buffers objects - for (var i = 0; i < bufferInfos.length ; i++) { - var buffer = new models.Buffer(bufferInfos[i]); - models.addBuffer(buffer); - // Switch to first buffer on startup - if (i === 0) { - models.setActiveBuffer(buffer.id); - } - } + handlers.handleBufferInfo(bufinfo); }); _requestHotlist().then(function(hotlist) { handlers.handleHotlistInfo(hotlist); + + if (successCallback) { + successCallback(); + } }); _requestSync(); @@ -123,10 +120,19 @@ weechat.factory('connection', * Handles websocket disconnection */ $log.info("Disconnected from relay"); + if ($rootScope.userdisconnect || !$rootScope.waseverconnected) { + handleClose(evt); + $rootScope.userdisconnect = false; + } else { + reconnect(evt); + } + }; + + var handleClose = function (evt) { ngWebsockets.failCallbacks('disconnection'); $rootScope.connected = false; $rootScope.$emit('relayDisconnect'); - if (ssl && evt.code === 1006) { + if (ssl && evt && evt.code === 1006) { // A password error doesn't trigger onerror, but certificate issues do. Check time of last error. if (typeof $rootScope.lastError !== "undefined" && (Date.now() - $rootScope.lastError) < 1000) { // abnormal disconnect by client, most likely ssl error @@ -166,11 +172,62 @@ weechat.factory('connection', $rootScope.errorMessage = true; $rootScope.securityError = true; $rootScope.$emit('relayDisconnect'); + + if (failCallback) { + failCallback(); + } } }; + var attemptReconnect = function (bufferId, timeout) { + $log.info('Attempting to reconnect...'); + var d = connectionData; + connect(d[0], d[1], d[2], d[3], d[4], function() { + // 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) { + // If timeout is ten minutes or more, give up + $log.info('Failed to reconnect, giving up'); + handleClose(); + } else { + $log.info('Failed to reconnect, scheduling next attempt in', timeout/1000, 'seconds'); + // Clear previous timer, if exists + if (reconnectTimer !== undefined) { + clearTimeout(reconnectTimer); + } + reconnectTimer = setTimeout(function() { + // exponential timeout increase + attemptReconnect(bufferId, timeout * 1.5); + }, timeout); + } + }); + }; + + + var reconnect = function (evt) { + if (connectionData.length < 5) { + // something is wrong + $log.error('Cannot reconnect, connection information is missing'); + return; + } + + $rootScope.reconnecting = true; + + var bufferId = models.getActiveBuffer().id, + timeout = 3000; // start with a three-second timeout + + reconnectTimer = setTimeout(function() { + attemptReconnect(bufferId, timeout); + }, timeout); + }; + var disconnect = function() { + $rootScope.userdisconnect = true; ngWebsockets.send(weeChat.Protocol.formatQuit()); }; @@ -270,7 +327,8 @@ weechat.factory('connection', sendMessage: sendMessage, sendCoreCommand: sendCoreCommand, fetchMoreLines: fetchMoreLines, - requestNicklist: requestNicklist + requestNicklist: requestNicklist, + attemptReconnect: attemptReconnect }; }]); })(); diff --git a/js/glowingbear.js b/js/glowingbear.js index 1be7dee..e2d5bd8 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -263,6 +263,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $rootScope.connected = false; $rootScope.waseverconnected = false; + $rootScope.userdisconnect = false; + $rootScope.reconnecting = false; $rootScope.models = models; @@ -503,6 +505,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $scope.connectbutton = 'Connect'; connection.disconnect(); }; + $scope.reconnect = function() { + var bufferId = models.getActiveBuffer().id; + connection.attemptReconnect(bufferId, 3000); + }; //XXX this is a bit out of place here, either move up to the rest of the firefox install code or remove $scope.install = function() { diff --git a/js/handlers.js b/js/handlers.js index 065a4b8..9ebecc5 100644 --- a/js/handlers.js +++ b/js/handlers.js @@ -43,6 +43,53 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific } }; + var handleBufferInfo = function(message) { + var bufferInfos = message.objects[0].content; + // buffers objects + for (var i = 0; i < bufferInfos.length ; i++) { + var bufferId = bufferInfos[i].pointers[0]; + var buffer = models.getBuffer(bufferId); + if (buffer !== undefined) { + // We already know this buffer + handleBufferUpdate(buffer, bufferInfos[i]); + } else { + buffer = new models.Buffer(bufferInfos[i]); + models.addBuffer(buffer); + // Switch to first buffer on startup + if (i === 0) { + models.setActiveBuffer(buffer.id); + } + } + } + }; + + var handleBufferUpdate = function(buffer, message) { + if (message.pointers[0] !== buffer.id) { + // this is information about some other buffer! + return; + } + + // weechat properties -- short name can be changed + buffer.shortName = message.short_name; + buffer.trimmedName = buffer.shortName.replace(/^[#&+]/, ''); + buffer.title = message.title; + buffer.number = message.number; + + // reset these, hotlist info will arrive shortly + buffer.notification = 0; + buffer.unread = 0; + buffer.lastSeen = -1; + + if (message.local_variables.type !== undefined) { + buffer.type = message.local_variables.type; + buffer.indent = (['channel', 'private'].indexOf(buffer.type) >= 0); + } + + if (message.notify !== undefined) { + buffer.notify = message.notify; + } + }; + var handleBufferLineAdded = function(message) { message.objects[0].content.forEach(function(l) { handleLine(l, false); @@ -215,7 +262,8 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific handleEvent: handleEvent, handleLineInfo: handleLineInfo, handleHotlistInfo: handleHotlistInfo, - handleNicklist: handleNicklist + handleNicklist: handleNicklist, + handleBufferInfo: handleBufferInfo }; }]); From b6260e7cc73638f6254aab478d041e283f45c48b Mon Sep 17 00:00:00 2001 From: David Cormier Date: Fri, 2 Jan 2015 23:59:51 -0500 Subject: [PATCH 02/13] plugins: add html5 video support Shows ogv, mp4 and webm files inside a video tag --- css/glowingbear.css | 4 ++++ js/plugins.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index 2888d13..bd3e08d 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -320,6 +320,10 @@ div.embed img.embed { max-width: 100%; } +video.embed { + max-width: 100%; +} + div.colourbox { display: inline-block; border-radius: 3px; diff --git a/js/plugins.js b/js/plugins.js index b282d13..8a84758 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -267,6 +267,15 @@ plugins.factory('userPlugins', function() { } }); + /* + * mp4 video Preview + */ + var videoPlugin = new UrlPlugin('video', function(url) { + if (url.match(/\.(mp4|webm|ogv)\b/i)) { + return ''; + } + }); + /* * Cloud Music Embedded Players */ @@ -382,7 +391,7 @@ plugins.factory('userPlugins', function() { }); return { - plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, tweetPlugin, vinePlugin] + plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, tweetPlugin, vinePlugin] }; From cfbc8108f3bfc3579b9596bbd5523bd817282375 Mon Sep 17 00:00:00 2001 From: David Cormier Date: Sat, 3 Jan 2015 00:01:46 -0500 Subject: [PATCH 03/13] plugins: add tests for video plugin Test ogv, webm and mp4 urls --- test/unit/plugins.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/unit/plugins.js b/test/unit/plugins.js index 537f86a..e179c0a 100644 --- a/test/unit/plugins.js +++ b/test/unit/plugins.js @@ -71,6 +71,16 @@ describe('filter', function() { plugins); })); + it('should recognize html5 videos', inject(function(plugins) { + expectTheseMessagesToContain([ + 'http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4', + 'http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', + 'http://www.quirksmode.org/html5/videos/big_buck_bunny.ogv', + ], + 'video', + plugins); + })); + it('should recognize images', inject(function(plugins) { expectTheseMessagesToContain([ 'http://i.imgur.com/BTNIDBR.gif', From 8f5ce92ada55456bef476dd588ad3587746d677c Mon Sep 17 00:00:00 2001 From: David Cormier Date: Wed, 18 Feb 2015 12:49:15 -0500 Subject: [PATCH 04/13] Bump version to 0.4.5 --- manifest.json | 2 +- manifest.webapp | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 9c8eb96..583dd44 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Glowing Bear", "description": "WeeChat Web frontend", - "version": "0.4.4", + "version": "0.4.5", "manifest_version": 2, "icons": { "32": "assets/img/favicon.png", diff --git a/manifest.webapp b/manifest.webapp index d17bbfa..2b4a2ba 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -25,5 +25,5 @@ "desktop-notification":{} }, "default_locale": "en", - "version": "0.4.4" + "version": "0.4.5" } diff --git a/package.json b/package.json index fdf3709..33f59f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "glowing-bear", "private": true, - "version": "0.4.4", + "version": "0.4.5", "description": "A web client for Weechat", "repository": "https://github.com/glowing-bear/glowing-bear", "license": "GPLv3", From de69f820fe410863cbbd789c6031239c5a02d941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 28 Feb 2015 21:30:57 +0100 Subject: [PATCH 05/13] Save emojify preference in settings This fixes a bug where the preference would not be saved --- index.html | 4 ++-- js/glowingbear.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index e1700ec..5cb87f5 100644 --- a/index.html +++ b/index.html @@ -275,7 +275,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
+ --> @@ -437,7 +437,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
diff --git a/js/glowingbear.js b/js/glowingbear.js index e2d5bd8..08b4346 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -35,7 +35,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', 'showtimestampSeconds': false, 'fontsize': '14px', 'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'), - 'readlineBindings': false + 'readlineBindings': false, + 'enableJSEmoji': false }); $scope.settings = settings; From 2523ff80ee2a7a463b45c24349e44b69a8518f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 8 Feb 2015 12:56:28 +0100 Subject: [PATCH 06/13] Improve app installation instructions Also fix encryption instructions URL for those who proxy their relay --- index.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 5cb87f5..8cab1a4 100644 --- a/index.html +++ b/index.html @@ -158,7 +158,7 @@

If you check the encryption box, the communication between browser and WeeChat will be encrypted with TLS.

-

Note: If you are using a self-signed certificate, you have to visit https://{{ settings.host || 'weechathost' }}:{{ settings.port || 'relayport' }}/ in your browser first to add a security exception. You can close that tab once you confirmed the certificate, no content will appear. The necessity of this process is a bug in Firefox and other browsers.

+

Note: If you are using a self-signed certificate, you have to visit https://{{ settings.host || 'weechathost' }}:{{ settings.port || 'relayport' }}/weechat in your browser first to add a security exception. You can close that tab once you confirmed the certificate, no content will appear. The necessity of this process is a bug in Firefox and other browsers.

Setup: If you want to use an encrypted session you first have to set up the relay to use TLS. You basically have two options: a self-signed certificate is easier to set up, but requires manual security exceptions. Using a certificate that is trusted by your browser requires more setup, but offers greater convenience later on and does not require security exceptions. You can find a guide to set up WeeChat with a free trusted certificate from StartSSL here. Should you wish to use a self-signed certificate instead, execute the following commands in a shell on the same host and as the user running WeeChat:

 $ mkdir -p ~/.weechat/ssl
@@ -185,11 +185,15 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           

             

               
You don't need to install anything to use this app, it should work with any modern browser. Start using it right now! However, there are a few ways to improve integration with your operating system.

-              
Firefox

-              
If you have a recent version of Firefox you can install glowing bear as an app. Click the button to install.

-              
+              
Mobile Applications

+              
If you're running Android 4.4 or later, you can install our app from the Google Play Store! We also provide an optimized application for Firefox OS devices. If you're using the Firefox browser, keep on reading below -- the Firefox OS app won't work for you

+              
Android app on Google Play Firefox OS app in the Firefox Marketplace

+              
Firefox Browser

+              
If you have a recent version of Firefox you can install Glowing Bear as a Firefox app. Click the button to install.

+              

+              
Note for self-signed certificates: Firefox does not share a certificate storage with Firefox apps, so accepting self-signed certificates is a bit tricky.

               
Chrome

-              
To install glowing bear as an app in Chrome, select Menu - Add to home screen (Android) or Menu - More tools - Create application shortcuts (desktop version).

+              
To install Glowing Bear as an app in Chrome for Android, select Menu - Add to home screen. In the desktop version of Chrome, click Menu - More tools - Create application shortcuts.
From 86f9ed8bd51217555cb1cf36eb011cc5c038c812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sun, 8 Feb 2015 11:39:37 +0100 Subject: [PATCH 07/13] Enable autocomplete on input, disable on search In essence, this reverts a29905e02c19168cf0f0efdd26404fe2157f2def which doesn't make much sense to me --- directives/input.html | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/directives/input.html b/directives/input.html index 553dcfa..e373298 100644 --- a/directives/input.html +++ b/directives/input.html @@ -1,6 +1,6 @@
- diff --git a/index.html b/index.html index 8cab1a4..ac366ce 100644 --- a/index.html +++ b/index.html @@ -240,7 +240,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
  • - +
  • From ed18a250fbf9c4b91660204832a1d2ed895e5e71 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 2 Mar 2015 22:08:45 +0100 Subject: [PATCH 08/13] save defaults to $store --- js/settings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/settings.js b/js/settings.js index 8c312fc..b153d1a 100644 --- a/js/settings.js +++ b/js/settings.js @@ -57,6 +57,9 @@ weechat.factory('settings', ['$store', '$rootScope', function($store, $rootScope for (var key in defaults) { // null means the key isn't set if ($store.get(key) === null) { + // Define property so it will get saved to store + defineProperty(key); + // Save to settings module AND to store this[key] = defaults[key]; } } From ff480cd0c6b0cf492930dc58117f028da854f0ae Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 2 Mar 2015 22:19:53 +0100 Subject: [PATCH 09/13] fix problem with activating saving of password --- js/glowingbear.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/js/glowingbear.js b/js/glowingbear.js index 08b4346..526c46f 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -283,6 +283,15 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', settings.password = ''; } + // Check if user decides to save password, and copy it over + settings.addCallback('savepassword', function(newvalue) { + if (settings.savepassword) { + // Init value in settings module + settings.setDefaults({'password': $scope.password}); + settings.password = $scope.password; + } + }); + $rootScope.wasMobileUi = false; if (utils.isMobileUi()) { $rootScope.wasMobileUi = true; From 97871fb83ff75e77d2caffecce9ff7b1e5baf41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Mon, 2 Mar 2015 22:54:13 +0100 Subject: [PATCH 10/13] Angular.js update 1.3.9 -> 1.3.14 bugfix releases --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index ac366ce..8946e3b 100644 --- a/index.html +++ b/index.html @@ -14,10 +14,10 @@ - - - - + + + + From 99f396b652ef925f3dd4a233217b34aa8b0b9824 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Sat, 7 Mar 2015 13:00:05 +0100 Subject: [PATCH 11/13] Check that nicklist exists before updating. --- js/models.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/models.js b/js/models.js index 6ee7295..db27acd 100644 --- a/js/models.js +++ b/js/models.js @@ -134,6 +134,12 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter) */ var updateNick = function(group, nick) { group = nicklist[group]; + if (group === undefined) { + // We are getting nicklist events for a buffer where not yet + // have populated the nicklist, so there will be nothing to + // update. Just ignore the event. + return; + } for(var i in group.nicks) { if (group.nicks[i].name === nick.name) { group.nicks[i] = nick; From ca5542e46db5d794c6ff25a68f03230ba372cb75 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Sat, 7 Mar 2015 13:09:25 +0100 Subject: [PATCH 12/13] Handle signal _buffer_localvar_changed Our parser already supports this message, we just were not hooking the signal up with the parser. --- js/handlers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/handlers.js b/js/handlers.js index 9ebecc5..b01757a 100644 --- a/js/handlers.js +++ b/js/handlers.js @@ -237,6 +237,7 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific _buffer_line_added: handleBufferLineAdded, _buffer_localvar_added: handleBufferLocalvarChanged, _buffer_localvar_removed: handleBufferLocalvarChanged, + _buffer_localvar_changed: handleBufferLocalvarChanged, _buffer_opened: handleBufferOpened, _buffer_title_changed: handleBufferTitleChanged, _buffer_renamed: handleBufferRenamed, From 70295110298dd673858ba93536d28ce713e8fc11 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Sat, 14 Mar 2015 21:10:19 +0100 Subject: [PATCH 13/13] 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 -
    - Reconnecting... Try now -
+
+

Connection to WeeChat lost

+ + Reconnecting... Click to try to reconnect now +
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,