diff --git a/client/salix/src/aclService.js b/client/core/src/lib/aclService.js similarity index 84% rename from client/salix/src/aclService.js rename to client/core/src/lib/aclService.js index 63e75278cf..78e5d23656 100644 --- a/client/salix/src/aclService.js +++ b/client/core/src/lib/aclService.js @@ -1,4 +1,7 @@ -import ngModule from './module'; +import {module} from '../module'; + +var acl = window.salix ? window.salix.acl : {}; +module.constant('aclConstant', acl); aclService.$inject = ['aclConstant']; function aclService(aclConstant) { @@ -29,4 +32,4 @@ function aclService(aclConstant) { }; } -ngModule.service('aclService', aclService); +module.service('aclService', aclService); diff --git a/client/core/src/lib/index.js b/client/core/src/lib/index.js index c911e09a3b..966f25e2fd 100644 --- a/client/core/src/lib/index.js +++ b/client/core/src/lib/index.js @@ -4,6 +4,7 @@ import './template'; import './getTemplate'; import './app'; import './interceptor'; +import './aclService'; export * from './util'; export {default as splitingRegister} from './splitingRegister'; diff --git a/client/salix/src/app.js b/client/salix/src/app.js index 92caaf50cd..a4b45629ec 100644 --- a/client/salix/src/app.js +++ b/client/salix/src/app.js @@ -1,6 +1,5 @@ import './module'; import './spliting'; -import './aclService'; import './configroutes'; import './config'; import './run'; diff --git a/client/salix/src/config.js b/client/salix/src/config.js index f4ceea3923..2d867074af 100644 --- a/client/salix/src/config.js +++ b/client/salix/src/config.js @@ -2,9 +2,6 @@ import ngModule from './module'; export const appName = 'salix'; -var acl = window[appName] ? window[appName].acl : {}; -ngModule.constant('aclConstant', acl); - config.$inject = ['$translatePartialLoaderProvider', '$httpProvider']; export function config($translatePartialLoaderProvider, $httpProvider) { $translatePartialLoaderProvider.addPart(appName);