From 3963e0ab3902af89450d8e90a340086f18504800 Mon Sep 17 00:00:00 2001 From: Brian Ford Date: Mon, 24 Aug 2015 12:13:51 -0700 Subject: [PATCH] refactor(router): rename HTML5LocationStrategy to PathLocationStrategy "HTML5" is a bit confusing. We want to differentiate between persisting location state to the URL path, and the URL hash. Hence `PathLocationStrategy`. BREAKING CHANGE `HTML5LocationStrategy` -> `PathLocationStrategy` Closes #3776 --- modules/angular2/router.ts | 6 +++--- ...html5_location_strategy.ts => path_location_strategy.ts} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename modules/angular2/src/router/{html5_location_strategy.ts => path_location_strategy.ts} (93%) diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts index 8e938a4b28..e42d1d3db6 100644 --- a/modules/angular2/router.ts +++ b/modules/angular2/router.ts @@ -12,7 +12,7 @@ export {RouteParams} from './src/router/instruction'; export {RouteRegistry} from './src/router/route_registry'; export {LocationStrategy} from './src/router/location_strategy'; export {HashLocationStrategy} from './src/router/hash_location_strategy'; -export {HTML5LocationStrategy} from './src/router/html5_location_strategy'; +export {PathLocationStrategy} from './src/router/path_location_strategy'; export {Location, APP_BASE_HREF} from './src/router/location'; export {Pipeline} from './src/router/pipeline'; export * from './src/router/route_config_decorator'; @@ -25,7 +25,7 @@ export {OpaqueToken, Type} from 'angular2/angular2'; export {ROUTE_DATA} from './src/router/route_data'; import {LocationStrategy} from './src/router/location_strategy'; -import {HTML5LocationStrategy} from './src/router/html5_location_strategy'; +import {PathLocationStrategy} from './src/router/path_location_strategy'; import {Router, RootRouter} from './src/router/router'; import {RouterOutlet} from './src/router/router_outlet'; import {RouterLink} from './src/router/router_link'; @@ -42,7 +42,7 @@ export const ROUTER_DIRECTIVES: List = CONST_EXPR([RouterOutlet, RouterLink export const ROUTER_BINDINGS: List = CONST_EXPR([ RouteRegistry, Pipeline, - CONST_EXPR(new Binding(LocationStrategy, {toClass: HTML5LocationStrategy})), + CONST_EXPR(new Binding(LocationStrategy, {toClass: PathLocationStrategy})), Location, CONST_EXPR( new Binding(Router, diff --git a/modules/angular2/src/router/html5_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts similarity index 93% rename from modules/angular2/src/router/html5_location_strategy.ts rename to modules/angular2/src/router/path_location_strategy.ts index cedfc6e4cf..a3325a425e 100644 --- a/modules/angular2/src/router/html5_location_strategy.ts +++ b/modules/angular2/src/router/path_location_strategy.ts @@ -4,7 +4,7 @@ import {EventListener, History, Location} from 'angular2/src/facade/browser'; import {LocationStrategy} from './location_strategy'; @Injectable() -export class HTML5LocationStrategy extends LocationStrategy { +export class PathLocationStrategy extends LocationStrategy { private _location: Location; private _history: History; private _baseHref: string;