Skip to content

Commit

Permalink
feat(angular): update angular to version 1.2
Browse files Browse the repository at this point in the history
Since 1.2 has moved $route and friends out into its own module/file,
then we must include references to this in our src files and test config.
  • Loading branch information
petebacondarwin committed Aug 17, 2013
1 parent 3a7e9c5 commit 1f1950d
Show file tree
Hide file tree
Showing 6 changed files with 8,323 additions and 5,873 deletions.
2 changes: 1 addition & 1 deletion client/gruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ module.exports = function (grunt) {
}
},
angular: {
src:['vendor/angular/angular.js'],
src:['vendor/angular/angular.js', 'vendor/angular/angular-route.js'],
dest: '<%= distdir %>/angular.js'
},
mongo: {
Expand Down
1 change: 1 addition & 0 deletions client/src/app/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
angular.module('app', [
'ngRoute',
'projectsinfo',
'dashboard',
'projects',
Expand Down
2 changes: 1 addition & 1 deletion client/src/common/services/crudRouteProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@
// .configHelper('crudRouteProvider', ['$routeProvider, crudRouteProvider]);
// ```
// Then we could dispense with the $get, the $inject and the closure wrapper around all this.
angular.module('services.crudRouteProvider', []).provider('crudRoute', crudRouteProvider);
angular.module('services.crudRouteProvider', ['ngRoute']).provider('crudRoute', crudRouteProvider);
})();
1 change: 1 addition & 0 deletions client/test/config/unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ files = [
JASMINE_ADAPTER,
'vendor/jquery/jquery.js',
'vendor/angular/angular.js',
'vendor/angular/angular-route.js',
'vendor/mongolab/mongolab-resource.js',
'test/vendor/angular/angular-mocks.js',
'vendor/angular-ui/**/*.js',
Expand Down
Loading

0 comments on commit 1f1950d

Please sign in to comment.