Rename loadIndicator service to loadingIndicator

pull/3940/head
Alex Dik 9 years ago
parent e560e04887
commit ee423a4aac
  1. 6
      frontend/app/components/common/services/loading-indicator.service.js
  2. 14
      frontend/app/components/routes/controllers/work-packages-list.controller.js
  3. 2
      frontend/app/components/routes/partials/work-packages.list.html

@ -28,12 +28,12 @@
angular
.module('openproject.workPackages.services')
.factory('loadIndicator', loadIndicator);
.factory('loadingIndicator', loadingIndicator);
function loadIndicator() {
function loadingIndicator() {
var config = {};
return loadIndicator = {
return {
get config() {
return config;
},

@ -34,10 +34,10 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
WorkPackagesTableService, WorkPackageService, ProjectService, QueryService,
PaginationService, AuthorisationService, UrlParamsHelper, Query,
OPERATORS_AND_LABELS_BY_FILTER_TYPE, NotificationsService, EditableFieldsState,
loadIndicator) {
loadingIndicator) {
$scope.projectIdentifier = $stateParams.projectPath || null;
$scope.loadIndicator = loadIndicator;
$scope.loadingIndicator = loadingIndicator;
// Setup
function initialSetup() {
@ -77,7 +77,7 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
}
);
loadIndicator.on(promise);
loadingIndicator.on(promise);
}
function fetchWorkPackagesFromUrlParams(queryParams) {
@ -219,7 +219,7 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
// Clear unsaved changes to current query
clearUrlQueryParams();
loadIndicator.on($state.go('work-packages.list', { 'query_id': queryId }));
loadingIndicator.on($state.go('work-packages.list', { 'query_id': queryId }));
};
function updateResults() {
@ -280,7 +280,7 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
'query_props': $location.search()['query_props']
});
loadIndicator.on(promise);
loadingIndicator.on(promise);
};
$scope.openOverviewTab = function() {
@ -289,7 +289,7 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
'query_props': $location.search()['query_props']
});
loadIndicator.on(promise);
loadingIndicator.on(promise);
};
$scope.closeDetailsView = function() {
@ -305,7 +305,7 @@ function WorkPackagesListController($scope, $rootScope, $state, $stateParams, $l
'query_props': $location.search()['query_props']
});
loadIndicator.on(promise);
loadingIndicator.on(promise);
}
};

@ -102,7 +102,7 @@
<back-url></back-url>
<div class="work-packages--split-view" cg-busy="loadIndicator.config"
<div class="work-packages--split-view" cg-busy="loadingIndicator.config"
ng-class="{'edit-all-mode': editAll.state}">
<div class="work-packages--list">
<div class="work-packages--list-table-area">

Loading…
Cancel
Save