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

Change the connect button text based on connection status

This commit is contained in:
Tor Hveem 2014-05-06 21:59:10 +02:00
parent d2f11ad89d
commit fbfeec8fca
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -85,7 +85,7 @@
</label> </label>
</div> </div>
</div> </div>
<button class="btn btn-lg btn-primary" ng-click="connect()">Connect <i class="glyphicon glyphicon-chevron-right"></i></button> <button class="btn btn-lg btn-primary" ng-click="connect()">{{ connectbutton }} <i class="glyphicon glyphicon-chevron-right"></i></button>
</form> </form>
</div> </div>
</div> </div>

9
js/glowingbear.js
View File

@ -345,9 +345,8 @@ function($rootScope,
$log.info("Disconnected from relay"); $log.info("Disconnected from relay");
failCallbacks('disconnection'); failCallbacks('disconnection');
$rootScope.connected = false; $rootScope.connected = false;
if ($rootScope.waseverconnected) {
$rootScope.$emit('relayDisconnect'); $rootScope.$emit('relayDisconnect');
} else if (ssl && evt.code === 1006) { if (ssl && evt.code === 1006) {
// A password error doesn't trigger onerror, but certificate issues do. Check time of last error. // 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) { if (typeof $rootScope.lastError !== "undefined" && (Date.now() - $rootScope.lastError) < 1000) {
// abnormal disconnect by client, most likely ssl error // abnormal disconnect by client, most likely ssl error
@ -643,7 +642,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
} }
var activeBuffer = models.getActiveBuffer(); var activeBuffer = models.getActiveBuffer();
if (activeBuffer) {
$rootScope.pageTitle = activeBuffer.shortName + ' | ' + activeBuffer.title; $rootScope.pageTitle = activeBuffer.shortName + ' | ' + activeBuffer.title;
}
}; };
$scope.updateFavico = function() { $scope.updateFavico = function() {
@ -730,7 +731,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Disabled it until it's fully investigated and fixed // Disabled it until it's fully investigated and fixed
//models.reinitialize(); //models.reinitialize();
$rootScope.$emit('notificationChanged'); $rootScope.$emit('notificationChanged');
$scope.connectbutton = 'Connect';
}); });
$scope.connectbutton = 'Connect';
$scope.showSidebar = true; $scope.showSidebar = true;
@ -969,9 +972,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.sslError = false; $rootScope.sslError = false;
$rootScope.securityError = false; $rootScope.securityError = false;
$rootScope.errorMessage = false; $rootScope.errorMessage = false;
$scope.connectbutton = 'Connecting ...';
connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl); connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
}; };
$scope.disconnect = function() { $scope.disconnect = function() {
$scope.connectbutton = 'Connect';
connection.disconnect(); connection.disconnect();
}; };
$scope.install = function() { $scope.install = function() {