cargdev/angular
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(router): changes the router setup to align with other modules

Browse Source
This commit is contained in:
vsavkin
2016-06-21 10:35:42 -07:00
parent c9d28492b7
commit 8dd3f59c81
24 changed files with 202 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/@angular/router/karma-test-shim.js
View File

@ -1,11 +1,10 @@
/*global jasmine, __karma__, window*/
Error.stackTraceLimit = Infinity;
Error.stackTraceLimit = 10;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
__karma__.loaded = function () {
};
function isJsFile(path) {
return path.slice(-3) == '.js';
}
@ -32,14 +31,9 @@ System.config(
{
map: {
'rxjs': 'node_modules/rxjs',
'@angular': 'node_modules/@angular',
'app': 'dist'
'@angular': 'dist/all/@angular'
},
packages: {
'app': {
main: 'main.js',
defaultExtension: 'js'
},
'@angular/core': {
main: 'index.js',
defaultExtension: 'js'
@ -60,6 +54,10 @@ System.config(
main: 'index.js',
defaultExtension: 'js'
},
'@angular/router': {
main: 'index.js',
defaultExtension: 'js'
},
'rxjs': {
main: 'Rx.js',
defaultExtension: 'js'