Преглед изворни кода

fixed loaduserdata as controller dependency

develop
Robin Thoni пре 8 година
родитељ
комит
faceffc356
2 измењених фајлова са 10 додато и 8 уклоњено
  1. 7
    5
      app.js
  2. 3
    3
      bower.json

+ 7
- 5
app.js Прегледај датотеку

@@ -19,10 +19,12 @@ luticate.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
19 19
         $stateProvider.state('root', {
20 20
             abstract: true,
21 21
             template: '<div ui-view=""></div>',
22
-            resolve: ['luticateAuthUsers', function(luticateAuthUsers)
23
-            {
24
-                return luticateAuthUsers.loadUserData(null);
25
-            }]
22
+            resolve: {
23
+                userData: ['luticateAuthUsers', function(luticateAuthUsers)
24
+                {
25
+                    return luticateAuthUsers.loadUserData(null);
26
+                }]
27
+            }
26 28
         });
27 29
 
28 30
         $stateProvider.state('login',{
@@ -98,7 +100,7 @@ luticate.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
98 100
         }]);
99 101
 
100 102
     }])
101
-    .run(['$rootScope', '$state', 'luticateAuthUsers',function ($rootScope, $state, luticateAuthUsers) {
103
+    .run(['$rootScope', '$state',function ($rootScope, $state) {
102 104
         $rootScope.$on('$stateChangeError', function (e, curr, prev) {
103 105
             //$state.go('login');
104 106
         });

+ 3
- 3
bower.json Прегледај датотеку

@@ -6,7 +6,7 @@
6 6
   "license": "",
7 7
   "private": true,
8 8
   "dependencies": {
9
-    "angular": "1.4.x",
9
+    "angular": "1.4.9",
10 10
     "jquery": "2.1.x",
11 11
     "angular-bootstrap": "^0.12",
12 12
     "angular-ui-router": "0.2.x",
@@ -14,13 +14,13 @@
14 14
     "less": "1.7.x",
15 15
     "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.x",
16 16
     "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x",
17
-    "angular-dialog-service": "~5.2.8",
17
+    "angular-dialog-service": "5.2.8",
18 18
     "ngSanitize": "~0.0.2",
19 19
     "angular-ui-validate": "~1.2.1",
20 20
     "flat-ui": "~2.2.2"
21 21
   },
22 22
   "resolutions": {
23 23
     "angular-bootstrap": "^0.12",
24
-    "angular": "^1.0.8"
24
+    "angular": "1.4.9"
25 25
   }
26 26
 }

Loading…
Откажи
Сачувај