X Tutup
Skip to content

Commit af2cd4d

Browse files
mheverymhevery
committed
fix(api): align dart/js APIs
1 parent 577ee37 commit af2cd4d

File tree

14 files changed

+1264
-672
lines changed

14 files changed

+1264
-672
lines changed

‎modules/angular2/angular2.dart‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,10 @@ library angular2;
55
*
66
* This library does not include `bootstrap`. Import `bootstrap.dart` instead.
77
*/
8-
export 'package:angular2/core.dart';
8+
export 'package:angular2/core.dart' hide forwardRef, resolveForwardRef, ForwardRefFn;
9+
export 'package:angular2/profile.dart';
10+
export 'package:angular2/lifecycle_hooks.dart';
11+
export 'package:angular2/src/core/application_ref.dart';
12+
export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE;
13+
export 'package:angular2/src/core/render/dom/dom_tokens.dart' hide APP_ID_RANDOM_BINDING;
14+
export 'package:angular2/src/core/render/dom/dom_tokens.dart' hide APP_ID_RANDOM_BINDING;

‎modules/angular2/core.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
library angular2.core;
22

33
// Public Core API
4+
export 'package:angular2/src/core/metadata.dart';
45
export 'package:angular2/src/core/util.dart';
56
export 'package:angular2/src/core/di.dart';
67
export 'package:angular2/src/core/pipes.dart';
@@ -12,11 +13,8 @@ export 'package:angular2/src/core/services.dart';
1213
export 'package:angular2/src/core/compiler.dart';
1314
export 'package:angular2/src/core/lifecycle.dart';
1415
export 'package:angular2/src/core/zone.dart';
15-
//Do not export render for dart. Must import from angular2/render
16-
//export 'package:angular2/src/core/render.dart';
16+
export 'package:angular2/src/core/render.dart';
1717
export 'package:angular2/src/core/directives.dart';
1818
export 'package:angular2/src/core/forms.dart';
19-
//Do not export debug for dart.
20-
//export 'package:angular2/src/core/debug.dart';
21-
export 'package:angular2/src/core/metadata.dart';
19+
export 'package:angular2/src/core/debug.dart';
2220
export 'package:angular2/src/core/change_detection.dart';

‎modules/angular2/src/core/application.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
// Public API for Application
22
export {APP_COMPONENT} from './application_tokens';
33
export {platform, commonBootstrap as bootstrap} from './application_common';
4-
export {PlatformRef, ApplicationRef} from './application_ref';
4+
export {
5+
PlatformRef,
6+
ApplicationRef,
7+
applicationCommonBindings,
8+
createNgZone,
9+
platformCommon,
10+
platformBindings
11+
} from './application_ref';

‎modules/angular2/src/core/directives.dart‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎modules/angular2/src/core/directives.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ import {NgNonBindable} from './directives/ng_non_bindable';
1212
import {NgStyle} from './directives/ng_style';
1313
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './directives/ng_switch';
1414

15-
export * from './directives/ng_class';
16-
export * from './directives/ng_for';
17-
export * from './directives/ng_if';
18-
export * from './directives/ng_non_bindable';
19-
export * from './directives/ng_style';
20-
export * from './directives/ng_switch';
15+
export {NgClass} from './directives/ng_class';
16+
export {NgFor} from './directives/ng_for';
17+
export {NgIf} from './directives/ng_if';
18+
export {NgNonBindable} from './directives/ng_non_bindable';
19+
export {NgStyle} from './directives/ng_style';
20+
export {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './directives/ng_switch';
21+
export * from './directives/observable_list_diff';
22+
2123

2224
/**
2325
* A collection of the Angular core directives that are likely to be used in each and every Angular

‎modules/angular2/src/core/directives/observable_list_diff.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// TS does not have Observables
2+
3+
// I need to be here to make TypeScript think this is a module.
4+
import {} from 'angular2/src/core/facade/lang';

‎modules/angular2/src/core/render/dom/dom_tokens.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const DOCUMENT: OpaqueToken = CONST_EXPR(new OpaqueToken('DocumentToken')
99
export const APP_ID: OpaqueToken = CONST_EXPR(new OpaqueToken('AppId'));
1010

1111
function _appIdRandomBindingFactory() {
12-
return `${randomChar()}${randomChar()}${randomChar()}`;
12+
return `${_randomChar()}${_randomChar()}${_randomChar()}`;
1313
}
1414

1515
/**
@@ -25,6 +25,6 @@ export const APP_ID_RANDOM_BINDING: Binding =
2525
export const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE: OpaqueToken =
2626
CONST_EXPR(new OpaqueToken('MaxInMemoryElementsPerTemplate'));
2727

28-
function randomChar(): string {
28+
function _randomChar(): string {
2929
return StringWrapper.fromCharCode(97 + Math.floor(Math.random() * 25));
3030
}

‎modules/angular2/test/public_api_spec.dart‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup