angularjs update to 1.2.1

erkobridee · Nov 20, 2013 · ca0b0b8 · ca0b0b8
1 parent b0fe45f
commit ca0b0b8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/app/main/module.js b/app/main/module.js
@@ -1,2 +1,13 @@
-//Declaração da aplicação
-angular.module('app', ['loadingBar', 'ngResource']);
+// Module definition
+angular.module(
+
+  // module name
+  'app', 
+
+  // module dependencies
+  [
+    'loadingBar', 
+    'ngRoute',
+    'ngResource'
+  ]
+);
diff --git a/app/require.config.js b/app/require.config.js
@@ -7,7 +7,7 @@ require({
 
     'app/main/module': {
       deps: [
-        'angular', 
+        'angular_route', 
         'angular_resource',
         'shared/components/loadingBar/module'
       ]

diff --git a/require.config.js b/require.config.js
@@ -4,23 +4,27 @@ require({
   paths: {
 
     jquery: [
-      'vendor/js/jquery-1.10.2.min'
+      'vendor/jquery/1.10.2/jquery.min'
     ],
 
     bootstrap: [
-      'vendor/bootstrap/js/bootstrap-3.0.1.min'
+      'vendor/bootstrap/3.0.2/js/bootstrap.min'
     ],
 
     angular: [
-      'vendor/angular/angular-1.1.5.min'
+      'vendor/angular.js/1.2.1/angular.min'
+    ],
+
+    angular_route: [
+      'vendor/angular.js/1.2.1/angular-route.min'
     ],
 
     angular_resource: [
-      'vendor/angular/angular-resource-1.1.5.min'
+      'vendor/angular.js/1.2.1/angular-resource.min'
     ],
 
     ngProgress: [
-      'vendor/angular/ngProgress.min'
+      'vendor/ngProgress/1.0.3/ngProgress.min'
     ]
 
   },
@@ -36,6 +40,10 @@ require({
       deps: ['bootstrap']
     },
 
+    'angular_route': {
+      deps: ['angular']
+    },
+
     'angular_resource': {
       deps: ['angular']
     },