Skip to content

Commit

Permalink
fix(api): align dart/js APIs
Browse files Browse the repository at this point in the history
  • Loading branch information
mhevery committed Sep 22, 2015
1 parent 577ee37 commit af2cd4d
Show file tree
Hide file tree
Showing 14 changed files with 1,264 additions and 672 deletions.
8 changes: 7 additions & 1 deletion modules/angular2/angular2.dart
Expand Up @@ -5,4 +5,10 @@ library angular2;
*
* This library does not include `bootstrap`. Import `bootstrap.dart` instead.
*/
export 'package:angular2/core.dart';
export 'package:angular2/core.dart' hide forwardRef, resolveForwardRef, ForwardRefFn;
export 'package:angular2/profile.dart';
export 'package:angular2/lifecycle_hooks.dart';
export 'package:angular2/src/core/application_ref.dart';
export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE;
export 'package:angular2/src/core/render/dom/dom_tokens.dart' hide APP_ID_RANDOM_BINDING;
export 'package:angular2/src/core/render/dom/dom_tokens.dart' hide APP_ID_RANDOM_BINDING;
8 changes: 3 additions & 5 deletions modules/angular2/core.dart
@@ -1,6 +1,7 @@
library angular2.core;

// Public Core API
export 'package:angular2/src/core/metadata.dart';
export 'package:angular2/src/core/util.dart';
export 'package:angular2/src/core/di.dart';
export 'package:angular2/src/core/pipes.dart';
Expand All @@ -12,11 +13,8 @@ export 'package:angular2/src/core/services.dart';
export 'package:angular2/src/core/compiler.dart';
export 'package:angular2/src/core/lifecycle.dart';
export 'package:angular2/src/core/zone.dart';
//Do not export render for dart. Must import from angular2/render
//export 'package:angular2/src/core/render.dart';
export 'package:angular2/src/core/render.dart';
export 'package:angular2/src/core/directives.dart';
export 'package:angular2/src/core/forms.dart';
//Do not export debug for dart.
//export 'package:angular2/src/core/debug.dart';
export 'package:angular2/src/core/metadata.dart';
export 'package:angular2/src/core/debug.dart';
export 'package:angular2/src/core/change_detection.dart';
9 changes: 8 additions & 1 deletion modules/angular2/src/core/application.ts
@@ -1,4 +1,11 @@
// Public API for Application
export {APP_COMPONENT} from './application_tokens';
export {platform, commonBootstrap as bootstrap} from './application_common';
export {PlatformRef, ApplicationRef} from './application_ref';
export {
PlatformRef,
ApplicationRef,
applicationCommonBindings,
createNgZone,
platformCommon,
platformBindings
} from './application_ref';
11 changes: 0 additions & 11 deletions modules/angular2/src/core/directives.dart

This file was deleted.

14 changes: 8 additions & 6 deletions modules/angular2/src/core/directives.ts
Expand Up @@ -12,12 +12,14 @@ import {NgNonBindable} from './directives/ng_non_bindable';
import {NgStyle} from './directives/ng_style';
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './directives/ng_switch';

export * from './directives/ng_class';
export * from './directives/ng_for';
export * from './directives/ng_if';
export * from './directives/ng_non_bindable';
export * from './directives/ng_style';
export * from './directives/ng_switch';
export {NgClass} from './directives/ng_class';
export {NgFor} from './directives/ng_for';
export {NgIf} from './directives/ng_if';
export {NgNonBindable} from './directives/ng_non_bindable';
export {NgStyle} from './directives/ng_style';
export {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './directives/ng_switch';
export * from './directives/observable_list_diff';


/**
* A collection of the Angular core directives that are likely to be used in each and every Angular
Expand Down
4 changes: 4 additions & 0 deletions modules/angular2/src/core/directives/observable_list_diff.ts
@@ -0,0 +1,4 @@
// TS does not have Observables

// I need to be here to make TypeScript think this is a module.
import {} from 'angular2/src/core/facade/lang';
4 changes: 2 additions & 2 deletions modules/angular2/src/core/render/dom/dom_tokens.ts
Expand Up @@ -9,7 +9,7 @@ export const DOCUMENT: OpaqueToken = CONST_EXPR(new OpaqueToken('DocumentToken')
export const APP_ID: OpaqueToken = CONST_EXPR(new OpaqueToken('AppId'));

function _appIdRandomBindingFactory() {
return `${randomChar()}${randomChar()}${randomChar()}`;
return `${_randomChar()}${_randomChar()}${_randomChar()}`;
}

/**
Expand All @@ -25,6 +25,6 @@ export const APP_ID_RANDOM_BINDING: Binding =
export const MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE: OpaqueToken =
CONST_EXPR(new OpaqueToken('MaxInMemoryElementsPerTemplate'));

function randomChar(): string {
function _randomChar(): string {
return StringWrapper.fromCharCode(97 + Math.floor(Math.random() * 25));
}
2 changes: 0 additions & 2 deletions modules/angular2/test/public_api_spec.dart

This file was deleted.

0 comments on commit af2cd4d

Please sign in to comment.