Update to AngularJS 1.2.4

meanjs · Dec 7, 2013 · f2a85f8 · f2a85f8
1 parent dbe7213
commit f2a85f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
@@ -2,6 +2,7 @@
 script(type='text/javascript', src='/lib/angular/angular.js')
 script(type='text/javascript', src='/lib/angular-cookies/angular-cookies.js')
 script(type='text/javascript', src='/lib/angular-resource/angular-resource.js')
+script(type='text/javascript', src='/lib/angular-route/angular-route.js')
 
 //Angular UI
 script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')

diff --git a/bower.json b/bower.json
@@ -3,14 +3,12 @@
   "version": "0.1.0",
   "dependencies": {
     "bootstrap": "2.3.2",
-    "angular": "1.0.6",
-    "angular-resource": "1.0.6",
-    "angular-cookies": "1.0.6",
-    "angular-bootstrap": "0.6.0",
-    "angular-ui-utils": "0.0.4",
-    "angular-mocks": "~1.0.8"
-  },
-  "resolutions": {
-    "angular": "1.0.6"
+    "angular": "1.2.4",
+    "angular-resource": "latest",
+    "angular-cookies": "latest",
+    "angular-bootstrap": "latest",
+    "angular-ui-utils": "latest",
+    "angular-mocks": "latest",
+    "angular-route": "latest"
   }
 }
diff --git a/public/js/app.js b/public/js/app.js
@@ -1,4 +1,4 @@
-angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', 'mean.system', 'mean.articles']);
+angular.module('mean', ['ngCookies', 'ngResource', 'ngRoute', 'ui.bootstrap', 'ui.route', 'mean.system', 'mean.articles']);
 
 angular.module('mean.system', []);
 angular.module('mean.articles', []);