Merge changes from topic 'yangman'

[dlux.git] / modules / common-layout-resources / src / main / resources / layout / layout.module.js

diff --git a/modules/common-layout-resources/src/main/resources/layout/layout.module.js b/modules/common-layout-resources/src/main/resources/layout/layout.module.js
index faef8bafe699ed8514237845351921ba7223731b..5438b0505a23aeec9dd20228870495585794b2c6 100644 (file)
--- a/modules/common-layout-resources/src/main/resources/layout/layout.module.js
+++ b/modules/common-layout-resources/src/main/resources/layout/layout.module.js
@@ -1,32 +1,35 @@
 // This module is used to populate views from the index.tpl.html
-// Each module will register html pages with the appropriate HelperProvider's and this module will take everything from those Helpers and fill the view.
-define(['angularAMD' ,'angular-ui-router', 'ocLazyLoad', 'common/general/common.general.directives', 'common/general/common.navigation.directives','app/core/core.services'], function(app) {
+// Each module will register html pages with the appropriate HelperProvider's
+// and this module will take everything from those Helpers and fill the view.
+define(['angular', 'angular-ui-router', 'ocLazyLoad', 'common/general/common.general.directives',
+  'common/general/common.navigation.directives', 'app/core/core.module'], function (angular) {
+  'use strict';
+
   var layout = angular.module('app.common.layout', ['ui.router.state', 'app.core', 'app.common.general', 'app.common.navigation']);
 
-  layout.config(function($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $provide, TopBarHelperProvider, NavHelperProvider, ContentHelperProvider) {
-    $urlRouterProvider.otherwise("/topology");
+  layout.config(function ($stateProvider, TopBarHelperProvider, NavHelperProvider, ContentHelperProvider) {
 
     $stateProvider.state('main', {
       url: '/',
-      views : {
-        'mainContent@' : {
+      views: {
+        'mainContent@': {
           controller: 'AppCtrl',
-          templateUrl : 'src/common/layout/index.tpl.html'
+          templateUrl: 'src/common/layout/index.tpl.html'
         },
-        'navigation@main' : {
+        'navigation@main': {
           template: NavHelperProvider.getViews(),
           controller: 'NavCtrl'
         },
-        'topbar@main' : {
-          template : TopBarHelperProvider.getViews(),
+        'topbar@main': {
+          template: TopBarHelperProvider.getViews(),
           controller: 'TopbarCtrl'
         },
-        'content@main' : {
-          template : ContentHelperProvider.getViews()
+        'content@main': {
+          template: ContentHelperProvider.getViews()
         }
       },
       resolve: {
-        loadCtrl: ['$ocLazyLoad', function($ocLazyLoad) {
+        loadCtrl: ['$ocLazyLoad', function ($ocLazyLoad) {
           return $ocLazyLoad.load({
             files: ['app/app.controller'].concat(TopBarHelperProvider.getControllers()).concat(NavHelperProvider.getControllers())
           });
@@ -34,13 +37,6 @@ define(['angularAMD' ,'angular-ui-router', 'ocLazyLoad', 'common/general/common.
       }
     });
 
-    layout.register = {
-      controller: $controllerProvider.register,
-      directive: $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-    };
-
   });
 
   return layout;