From f2a85f8dcd2ba5892611d2fb2e7d1f6e9c21dcc5 Mon Sep 17 00:00:00 2001 From: Jonathan Dizdarevic Date: Sat, 7 Dec 2013 19:30:41 +0100 Subject: [PATCH] Update to AngularJS 1.2.4 --- app/views/includes/foot.jade | 1 + bower.json | 16 +++++++--------- public/js/app.js | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 1533a57b..2a1a3538 100755 --- 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 index 311d5caf..2862c712 100644 --- 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 index 99c0b1bf..eff39efa 100644 --- 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', []); \ No newline at end of file