garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

added a way to display an announcement

Browse Source
This commit is contained in:
Athou
2013-04-26 07:40:39 +02:00
parent 51f11e48b5
commit e3682ac844
8 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/js/controllers.js
View File

@@ -162,15 +162,16 @@ function($scope, $timeout, $stateParams, $window, $location, $state, $route, Cat
}]);
module.controller('ToolbarCtrl', ['$scope', '$http', '$state', '$stateParams',
'$route', '$location', 'SettingsService', 'EntryService', 'ProfileService', 'AnalyticsService',
'$route', '$location', 'SettingsService', 'EntryService', 'ProfileService', 'AnalyticsService', 'ServerService',
function($scope, $http, $state, $stateParams, $route, $location,
SettingsService, EntryService, ProfileService, AnalyticsService) {
SettingsService, EntryService, ProfileService, AnalyticsService, ServerService) {
function totalActiveAjaxRequests() {
return ($http.pendingRequests.length + $.active);
}
$scope.session = ProfileService.get();
$scope.ServerService = ServerService.get();
$scope.loading = true;
$scope.$watch(totalActiveAjaxRequests, function() {