diff --git a/app/scripts/loader.js b/app/scripts/loader.js index b0159e12..3d7ea6c6 100644 --- a/app/scripts/loader.js +++ b/app/scripts/loader.js @@ -4,6 +4,7 @@ 'jquery': '../bower_components/jquery/jquery', 'angular': '../bower_components/angular/angular', 'angular-resource': '../bower_components/angular-resource/angular-resource', + 'angular-route': '../bower_components/angular-route/angular-route', 'angular-translate':'../bower_components/angular-translate/angular-translate', 'angular-translate-loader-static-files':'../bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files', 'angular-mocks': '../bower_components/angular-mocks/angular-mocks', @@ -32,6 +33,7 @@ shim: { 'angular': { exports: 'angular' }, 'angular-resource': { deps: ['angular'] }, + 'angular-route': { deps: ['angular'] }, 'angular-translate': { deps: ['angular'] }, 'angular-translate-loader-static-files': {deps: ['angular' , 'angular-translate'] }, 'angularui': { deps: ['angular'] }, @@ -56,6 +58,7 @@ 'angular', 'jquery', 'angular-resource', + 'angular-route', 'angular-translate', 'angular-translate-loader-static-files', 'angularui', diff --git a/app/scripts/mifosX.js b/app/scripts/mifosX.js index 71c8198b..4853f394 100644 --- a/app/scripts/mifosX.js +++ b/app/scripts/mifosX.js @@ -2,7 +2,7 @@ var mifosX = (function(module) { module.ng = { config: angular.module('config_params' , ['configurations']), services: angular.module('MifosX_Services', ['ngResource']), - application: angular.module('MifosX_Application', ['MifosX_Services', 'config_params', 'webStorageModule', 'ui.bootstrap' , 'pascalprecht.translate','nvd3ChartDirectives','notificationWidget', 'angularFileUpload','modified.datepicker','ngSanitize','LocalStorageModule','ngCsv','frAngular']) + application: angular.module('MifosX_Application', ['MifosX_Services', 'config_params', 'webStorageModule', 'ui.bootstrap' , 'pascalprecht.translate','nvd3ChartDirectives','notificationWidget', 'angularFileUpload','modified.datepicker','ngRoute','ngSanitize','LocalStorageModule','ngCsv','frAngular']) }; return module; }(mifosX || {})); diff --git a/bower.json b/bower.json index 94c7ab1b..1f728785 100644 --- a/bower.json +++ b/bower.json @@ -5,9 +5,10 @@ "lib" ], "dependencies": { - "angular": "1.0.7", - "angular-resource": "1.0.7", - "angular-mocks": "1.0.7", + "angular": "1.2.10", + "angular-resource": "1.2.10", + "angular-route": "1.2.10", + "angular-mocks": "1.2.10", "angular-bootstrap": "0.6.0", "angular-webstorage": "0.9.3", "jquery": "1.8.3", @@ -26,7 +27,7 @@ "jasmine": "1.3.1" }, "resolutions": { - "angular": "1.0.7", + "angular": "1.2.10", "d3": "3.3.9" } }