repackaging: all the repackaging changes squashed
This commit is contained in:
3
modules/angular2/src/alt_router/core_private.ts
Normal file
3
modules/angular2/src/alt_router/core_private.ts
Normal file
@ -0,0 +1,3 @@
|
||||
import {__core_private__} from '@angular/core';
|
||||
|
||||
export var makeDecorator: typeof __core_private__.makeDecorator = __core_private__.makeDecorator;
|
@ -13,11 +13,11 @@ import {
|
||||
Input,
|
||||
OnDestroy,
|
||||
Optional
|
||||
} from 'angular2/core';
|
||||
} from '@angular/core';
|
||||
import {RouterOutletMap, Router} from '../router';
|
||||
import {RouteSegment, UrlSegment, Tree} from '../segments';
|
||||
import {isString, isPresent} from 'angular2/src/facade/lang';
|
||||
import {ObservableWrapper} from 'angular2/src/facade/async';
|
||||
import {isString, isPresent} from '@angular/facade/src/lang';
|
||||
import {ObservableWrapper} from '@angular/facade/src/async';
|
||||
|
||||
@Directive({selector: '[routerLink]'})
|
||||
export class RouterLink implements OnDestroy {
|
||||
@ -59,4 +59,4 @@ export class RouterLink implements OnDestroy {
|
||||
this.isActive = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8,10 +8,10 @@ import {
|
||||
ComponentFactory,
|
||||
ReflectiveInjector,
|
||||
OnInit
|
||||
} from 'angular2/core';
|
||||
} from '@angular/core';
|
||||
import {RouterOutletMap} from '../router';
|
||||
import {DEFAULT_OUTLET_NAME} from '../constants';
|
||||
import {isPresent, isBlank} from 'angular2/src/facade/lang';
|
||||
import {isPresent, isBlank} from '@angular/facade/src/lang';
|
||||
|
||||
@Directive({selector: 'router-outlet'})
|
||||
export class RouterOutlet {
|
||||
@ -39,4 +39,4 @@ export class RouterOutlet {
|
||||
this._loaded = this._location.createComponent(factory, this._location.length, inj, []);
|
||||
return this._loaded;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {Type, isBlank} from 'angular2/src/facade/lang';
|
||||
import {Type, isBlank} from '@angular/facade/src/lang';
|
||||
|
||||
export function hasLifecycleHook(name: string, obj: Object): boolean {
|
||||
if (isBlank(obj)) return false;
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {Tree, TreeNode, UrlSegment, RouteSegment, rootNode, UrlTree, RouteTree} from './segments';
|
||||
import {isBlank, isPresent, isString, isStringMap} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {isBlank, isPresent, isString, isStringMap} from '@angular/facade/src/lang';
|
||||
import {ListWrapper} from '@angular/facade/src/collection';
|
||||
|
||||
export function link(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTree,
|
||||
change: any[]): UrlTree {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {RoutesMetadata, RouteMetadata} from "./metadata";
|
||||
import {makeDecorator} from 'angular2/src/core/util/decorators';
|
||||
import {makeDecorator} from '../core_private';
|
||||
export interface RoutesFactory {
|
||||
(routes: RouteMetadata[]): any;
|
||||
new (routes: RouteMetadata[]): RoutesMetadata;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {Type, stringify} from "angular2/src/facade/lang";
|
||||
import {Type, stringify} from "@angular/facade/src/lang";
|
||||
|
||||
export abstract class RouteMetadata {
|
||||
abstract get path(): string;
|
||||
|
@ -1,12 +1,12 @@
|
||||
import {RouteSegment, UrlSegment, Tree, TreeNode, rootNode, UrlTree, RouteTree} from './segments';
|
||||
import {RoutesMetadata, RouteMetadata} from './metadata/metadata';
|
||||
import {Type, isBlank, isPresent, stringify} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/promise';
|
||||
import {BaseException} from 'angular2/src/facade/exceptions';
|
||||
import {ComponentResolver} from 'angular2/core';
|
||||
import {Type, isBlank, isPresent, stringify} from '@angular/facade/src/lang';
|
||||
import {ListWrapper, StringMapWrapper} from '@angular/facade/src/collection';
|
||||
import {PromiseWrapper} from '@angular/facade/src/promise';
|
||||
import {BaseException} from '@angular/core';
|
||||
import {ComponentResolver} from '@angular/core';
|
||||
import {DEFAULT_OUTLET_NAME} from './constants';
|
||||
import {reflector} from 'angular2/src/core/reflection/reflection';
|
||||
import {reflector} from '@angular/core';
|
||||
|
||||
// TODO: vsavkin: recognize should take the old tree and merge it
|
||||
export function recognize(componentResolver: ComponentResolver, type: Type,
|
||||
@ -179,4 +179,4 @@ class _MatchResult {
|
||||
function _readMetadata(componentType: Type) {
|
||||
let metadata = reflector.annotations(componentType).filter(f => f instanceof RoutesMetadata);
|
||||
return ListWrapper.first(metadata);
|
||||
}
|
||||
}
|
||||
|
@ -1,19 +1,14 @@
|
||||
import {OnInit, provide, ReflectiveInjector, ComponentResolver} from 'angular2/core';
|
||||
import {OnInit, provide, ReflectiveInjector, ComponentResolver} from '@angular/core';
|
||||
import {RouterOutlet} from './directives/router_outlet';
|
||||
import {Type, isBlank, isPresent} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {
|
||||
EventEmitter,
|
||||
Observable,
|
||||
PromiseWrapper,
|
||||
ObservableWrapper
|
||||
} from 'angular2/src/facade/async';
|
||||
import {StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {BaseException} from 'angular2/src/facade/exceptions';
|
||||
import {Type, isBlank, isPresent} from '@angular/facade/src/lang';
|
||||
import {ListWrapper} from '@angular/facade/src/collection';
|
||||
import {EventEmitter, Observable, PromiseWrapper, ObservableWrapper} from '@angular/facade/src/async';
|
||||
import {StringMapWrapper} from '@angular/facade/src/collection';
|
||||
import {BaseException} from '@angular/core';
|
||||
import {RouterUrlSerializer} from './router_url_serializer';
|
||||
import {CanDeactivate} from './interfaces';
|
||||
import {recognize} from './recognize';
|
||||
import {Location} from 'angular2/platform/common';
|
||||
import {Location} from '@angular/common';
|
||||
import {link} from './link';
|
||||
|
||||
import {
|
||||
@ -223,4 +218,4 @@ class _LoadSegments {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
import {ROUTER_PROVIDERS_COMMON} from './router_providers_common';
|
||||
import {
|
||||
BrowserPlatformLocation
|
||||
} from 'angular2/src/platform/browser/location/browser_platform_location';
|
||||
import {PlatformLocation} from 'angular2/platform/common';
|
||||
} from '@angular/platform-browser';
|
||||
import {PlatformLocation} from '@angular/common';
|
||||
|
||||
export const ROUTER_PROVIDERS: any[] = /*@ts2dart_const*/[
|
||||
ROUTER_PROVIDERS_COMMON,
|
||||
|
@ -1,9 +1,9 @@
|
||||
import {OpaqueToken, ComponentResolver} from 'angular2/core';
|
||||
import {LocationStrategy, PathLocationStrategy, Location} from 'angular2/platform/common';
|
||||
import {OpaqueToken, ComponentResolver} from '@angular/core';
|
||||
import {LocationStrategy, PathLocationStrategy, Location} from '@angular/common';
|
||||
import {Router, RouterOutletMap} from './router';
|
||||
import {RouterUrlSerializer, DefaultRouterUrlSerializer} from './router_url_serializer';
|
||||
import {ApplicationRef} from 'angular2/core';
|
||||
import {BaseException} from 'angular2/src/facade/exceptions';
|
||||
import {ApplicationRef} from '@angular/core';
|
||||
import {BaseException} from '@angular/core';
|
||||
|
||||
export const ROUTER_PROVIDERS_COMMON: any[] = /*@ts2dart_const*/[
|
||||
RouterOutletMap,
|
||||
@ -28,4 +28,4 @@ function routerFactory(app: ApplicationRef, componentResolver: ComponentResolver
|
||||
routerOutletMap, location);
|
||||
app.registerDisposeListener(() => router.dispose());
|
||||
return router;
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
import {SpyLocation} from 'angular2/src/mock/location_mock';
|
||||
import {Location} from 'angular2/platform/common';
|
||||
import {SpyLocation} from '@angular/common/testing';
|
||||
import {Location} from '@angular/common';
|
||||
import {Router, RouterOutletMap} from './router';
|
||||
import {RouterUrlSerializer, DefaultRouterUrlSerializer} from './router_url_serializer';
|
||||
import {Component, ComponentResolver} from 'angular2/core';
|
||||
import {Component, ComponentResolver} from '@angular/core';
|
||||
|
||||
@Component({selector: 'fake-app-root-comp', template: `<span></span>`})
|
||||
class FakeAppRootCmp {
|
||||
|
@ -1,7 +1,6 @@
|
||||
import {UrlSegment, Tree, TreeNode, rootNode, UrlTree} from './segments';
|
||||
import {BaseException} from 'angular2/src/facade/exceptions';
|
||||
import {isBlank, isPresent, RegExpWrapper} from 'angular2/src/facade/lang';
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {BaseException} from '@angular/core';
|
||||
import {isBlank, isPresent, RegExpWrapper} from '@angular/facade/src/lang';
|
||||
|
||||
export abstract class RouterUrlSerializer {
|
||||
abstract parse(url: string): UrlTree;
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {ComponentFactory} from 'angular2/core';
|
||||
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {Type, isBlank, isPresent, stringify} from 'angular2/src/facade/lang';
|
||||
import {ComponentFactory, Type} from '@angular/core';
|
||||
import {StringMapWrapper, ListWrapper} from '@angular/facade/src/collection';
|
||||
import {isBlank, isPresent, stringify} from '@angular/facade/src/lang';
|
||||
|
||||
export class Tree<T> {
|
||||
/** @internal */
|
||||
@ -164,4 +164,4 @@ export function equalUrlSegments(a: UrlSegment, b: UrlSegment): boolean {
|
||||
|
||||
export function routeSegmentComponentFactory(a: RouteSegment): ComponentFactory<any> {
|
||||
return a._componentFactory;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user