honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Global && src/facade && Protractor): Allows List to be imported.

Browse Source 
Allows the List type to be imported from 'angular2/src/facade/collection'
This commit is contained in:
Ian Riley 2015-06-01 17:49:14 -07:00 committed by Tobias Bosch
parent 9e36539052
commit 1d24e2cf23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/globals.d.ts vendored
View File

@ -3,7 +3,7 @@
*/ */
/// <reference path="typings/zone/zone.d.ts"/> /// <reference path="typings/zone/zone.d.ts"/>
/// <reference path="traceur-runtime.d.ts" />
declare var assert: any; declare var assert: any;
declare type int = number; declare type int = number;

1
modules/angular2/src/facade/lang.ts
View File

@ -1,3 +1,4 @@
/// <reference path="../../globals.d.ts" />
var _global: BrowserNodeGlobal = <any>(typeof window === 'undefined' ? global : window); var _global: BrowserNodeGlobal = <any>(typeof window === 'undefined' ? global : window);
export {_global as global}; export {_global as global};

3
protractor-shared.js
View File

@ -1,5 +1,6 @@
// load traceur runtime as our tests are written in es6 // load traceur runtime as our tests are written in es6
require('traceur/bin/traceur-runtime.js'); require('traceur/bin/traceur-runtime.js');
require('reflect-metadata');
var fs = require('fs-extra'); var fs = require('fs-extra');
var argv = require('yargs') var argv = require('yargs')
@ -250,4 +251,4 @@ function mergeInto(src, target) {
target[prop] = src[prop]; target[prop] = src[prop];
} }
return target; return target;
} }