Skip to content

Commit

Permalink
fix(loader): Disable loader by default
Browse files Browse the repository at this point in the history
Set visibility of loader to false by default and remove unnecessary loader code.

re #286
  • Loading branch information
mpfeil committed Nov 26, 2018
1 parent 5483a4b commit b56092b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/components/loader.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

function activate () {
vm.visible = true;
vm.visible = false;
vm.messageText = 'Fetching boxes and measurements';
}

Expand Down
6 changes: 2 additions & 4 deletions app/scripts/controllers/account.dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
.module('openSenseMapApp')
.controller('AccountDashboardController', AccountDashboardController);

AccountDashboardController.$inject = ['AccountService', 'LocalStorageService', '$scope', '$rootScope'];
AccountDashboardController.$inject = ['AccountService', 'LocalStorageService', '$scope'];

function AccountDashboardController (AccountService, LocalStorageService, $scope, $rootScope) {
function AccountDashboardController (AccountService, LocalStorageService, $scope) {
var vm = this;
var localStorageKey = 'osem.dashboard.listStyle';
var localStorageOrderByKey = 'osem.dashboard.orderBy';
Expand All @@ -21,8 +21,6 @@
////

function activate () {
$rootScope.$broadcast('osemLoaderVisibility', { visible: false });

var listStyleFromLocalStorage = LocalStorageService.getValue(localStorageKey);
if (listStyleFromLocalStorage) {
vm.listStyle = listStyleFromLocalStorage;
Expand Down
5 changes: 2 additions & 3 deletions app/scripts/controllers/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
.module('openSenseMapApp')
.controller('InfoController', InfoController);

InfoController.$inject = ['$rootScope', '$state', 'app'];
function InfoController ($rootScope, $state, app) {
InfoController.$inject = ['$state', 'app'];
function InfoController ($state, app) {
var vm = this;
vm.app = app;
vm.tabActive = {
Expand All @@ -22,7 +22,6 @@
////////////////

function activate () {
$rootScope.$broadcast('osemLoaderVisibility', { visible: false });
changeActiveTab($state.current.url.split('/')[1]);
}

Expand Down

0 comments on commit b56092b

Please sign in to comment.