masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #814 from JakeStevenson/bug/resume-when-power-off 

Fix bug where disconnecting using the 'power' button, resume acted strange
This commit is contained in:
Lorenz Hübschle-Schneider 2016-09-07 22:43:01 +02:00 committed by GitHub
parent 18e88735be 6cc5fab302
commit a20a9b7dfb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/bufferResume.js
View File

@ -47,8 +47,8 @@ bufferResume.service('bufferResume', ['settings', function(settings) {
}; };
// Clear out the recorded info. Maybe we'll do this when the user chooses to disconnect? // Clear out the recorded info. Maybe we'll do this when the user chooses to disconnect?
resumer.clear = function() { resumer.reset = function() {
record(undefined); hasResumed = false;
}; };
return resumer; return resumer;

2
js/glowingbear.js
View File

@ -260,6 +260,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.$emit('notificationChanged'); $rootScope.$emit('notificationChanged');
$scope.connectbutton = 'Connect'; $scope.connectbutton = 'Connect';
$scope.connectbuttonicon = 'glyphicon-chevron-right'; $scope.connectbuttonicon = 'glyphicon-chevron-right';
bufferResume.reset();
}); });
$scope.connectbutton = 'Connect'; $scope.connectbutton = 'Connect';
$scope.connectbuttonicon = 'glyphicon-chevron-right'; $scope.connectbuttonicon = 'glyphicon-chevron-right';
@ -600,6 +601,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.disconnect = function() { $scope.disconnect = function() {
$scope.connectbutton = 'Connect'; $scope.connectbutton = 'Connect';
$scope.connectbuttonicon = 'glyphicon-chevron-right'; $scope.connectbuttonicon = 'glyphicon-chevron-right';
bufferResume.reset();
connection.disconnect(); connection.disconnect();
}; };
$scope.reconnect = function() { $scope.reconnect = function() {