diff --git a/css/spinner.css b/css/spinner.css deleted file mode 100644 index fde0c40..0000000 --- a/css/spinner.css +++ /dev/null @@ -1,41 +0,0 @@ -.spinner { - margin: 0px auto 0; - width: 70px; - text-align: center; - } - - .spinner > div { - width: 10px; - height: 10px; - background-color: #999999; - - border-radius: 100%; - display: inline-block; - -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both; - animation: sk-bouncedelay 1.4s infinite ease-in-out both; - } - - .spinner .bounce1 { - -webkit-animation-delay: -0.64s; - animation-delay: -0.64s; - } - - .spinner .bounce2 { - -webkit-animation-delay: -0.32s; - animation-delay: -0.32s; - } - - @-webkit-keyframes sk-bouncedelay { - 0%, 80%, 100% { -webkit-transform: scale(0) } - 40% { -webkit-transform: scale(1.0) } - } - - @keyframes sk-bouncedelay { - 0%, 80%, 100% { - -webkit-transform: scale(0); - transform: scale(0); - } 40% { - -webkit-transform: scale(1.0); - transform: scale(1.0); - } - } diff --git a/index.html b/index.html index aebe28a..3a68daf 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,6 @@ Chimeverse - @@ -57,14 +56,7 @@

Chimeverse

-
-
-
-
-
-
-
-
0.0.16
+
0.0.16
diff --git a/main.js b/main.js index 490d151..fa3c896 100644 --- a/main.js +++ b/main.js @@ -33,7 +33,7 @@ function createWindow () { menuService.createMenu() // Open the DevTools. - mainWindow.webContents.openDevTools() + // mainWindow.webContents.openDevTools() // Emitted when the window is closed. mainWindow.on('closed', function () { diff --git a/renderer.js b/renderer.js index d65547f..1af2032 100644 --- a/renderer.js +++ b/renderer.js @@ -88,7 +88,7 @@ angApp.factory('SystemService', () => { }) -angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService) => { +angApp.factory('ChimeVerseService', (SettingsServise, SystemService) => { let chimeverseService = {} @@ -124,9 +124,6 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService) _converse.api.waitUntil('rosterContactsFetched'), _converse.api.waitUntil('chatBoxesFetched') ]).then(() => { - _converse.once('contactPresenceChanged', (data) => { - $rootScope.$broadcast('ChimeVerseService:connected') - }) _converse.api.listen.on('logout', () => { chimeverseService.logout() }) @@ -163,23 +160,17 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService) }) -angApp.controller('AppController', function ($scope, $rootScope, ChimeVerseService) { +angApp.controller('AppController', function ($scope, ChimeVerseService) { const { ipcRenderer } = require('electron'); $scope.showLoginForm = false - $scope.connectSpinner = true ipcRenderer.on('force-logout-event', () => { ChimeVerseService.logout() ipcRenderer.getCurrentWindow().reload() }) - $rootScope.$on('ChimeVerseService:connected', function () { - $scope.connectSpinner = false - $scope.$apply() - }) - $scope.addAccountAction = () => { ChimeVerseService.settings.addCredentials($scope.bosh, $scope.login, $scope.password) $scope.showLoginForm = false