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

no redirecting, removeautoconnect on hash

Browse Source
This commit is contained in:
Jeremy Mahieu 2019-12-18 19:52:27 +01:00 committed by Lorenz Hübschle-Schneider
parent 6fcb54f7aa
commit 3bffb13930
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/glowingbear.js
View File

@ -11,12 +11,6 @@ document.addEventListener("deviceready", function () {
var weechat = angular.module('weechat', ['ngRoute', 'localStorage', 'weechatModels', 'bufferResume', 'plugins', 'IrcUtils', 'ngSanitize', 'ngWebsockets', 'ngTouch'], ['$compileProvider', '$locationProvider', function($compileProvider, $locationProvider) { var weechat = angular.module('weechat', ['ngRoute', 'localStorage', 'weechatModels', 'bufferResume', 'plugins', 'IrcUtils', 'ngSanitize', 'ngWebsockets', 'ngTouch'], ['$compileProvider', '$locationProvider', function($compileProvider, $locationProvider) {
// hacky way to be able to find out if we're in debug mode // hacky way to be able to find out if we're in debug mode
weechat.compileProvider = $compileProvider; weechat.compileProvider = $compileProvider;
//remove hashbang from url
$locationProvider.html5Mode({
enabled: true,
requireBase: false
}).hashPrefix('');
}]); }]);
weechat.config(['$compileProvider', function ($compileProvider) { weechat.config(['$compileProvider', function ($compileProvider) {
// hack to determine whether we're executing the tests // hack to determine whether we're executing the tests
@ -988,30 +982,22 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
if($location.search().password) { $scope.settings.password = $location.search().password;} if($location.search().password) { $scope.settings.password = $location.search().password;}
if($location.search().autoconnect) { $scope.settings.autoconnect = $location.search().autoconnect === 'true';} if($location.search().autoconnect) { $scope.settings.autoconnect = $location.search().autoconnect === 'true';}
if (window.location.hash) {
notifications.requestNotificationPermission();
$rootScope.sslError = false;
$rootScope.securityError = false;
$rootScope.errorMessage = false;
$rootScope.bufferBottom = true;
$scope.connectbutton = 'Connecting';
$scope.connectbuttonicon = 'glyphicon-chevron-right';
connection.connect(settings.host, settings.port, settings.path, password, ssl);
}
}; };
}]); }]);
weechat.config(['$routeProvider', weechat.config(['$routeProvider', '$locationProvider',
function($routeProvider) { function($routeProvider, $locationProvider) {
$routeProvider.when('/', { $routeProvider.when('/', {
templateUrl: 'index.html', templateUrl: 'index.html',
controller: 'WeechatCtrl' controller: 'WeechatCtrl'
})
//for legacy reasons redirect the /#! to /
.otherwise({
redirectTo: '/'
}); });
//remove hashbang from url
$locationProvider.html5Mode({
enabled: true,
requireBase: false
}).hashPrefix('');
} }
]); ]);