Revert "fix(url_resolver): in Dart make package urls relative to AppRootUrl"

This reverts commit 469afda53e.
This commit is contained in:
Misko Hevery
2015-07-27 14:15:02 -07:00
parent 30bd2a3fc7
commit a2bb81c406
18 changed files with 33 additions and 58 deletions

View File

@ -37,5 +37,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -20,5 +20,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -2,12 +2,22 @@ library angular2_examples.material.demo_common;
import 'package:angular2/src/dom/browser_adapter.dart';
import 'package:angular2/src/services/url_resolver.dart';
import 'package:angular2/src/services/app_root_url.dart';
void commonDemoSetup() {
BrowserDomAdapter.makeCurrent();
}
class DemoUrlResolver extends UrlResolver {
DemoUrlResolver(AppRootUrl appRootUrl) : super(appRootUrl);
@override
String resolve(String baseUrl, String url) {
const MATERIAL_PKG = 'package:angular2_material/';
// We run a proxy server in front of pub serve that prepends "example" to
// paths
if (url.startsWith(MATERIAL_PKG)) {
return '/examples/packages/angular2_material/' + url.substring(MATERIAL_PKG.length);
}
return super.resolve(baseUrl, url);
}
}

View File

@ -19,7 +19,7 @@ export function commonDemoSetup(): void {
@Injectable()
export class DemoUrlResolver extends UrlResolver {
constructor() {
super(null);
super();
}
resolve(baseUrl: string, url: string): string {

View File

@ -92,5 +92,5 @@ class SimpleDialogComponent {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -18,5 +18,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -12,5 +12,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -20,5 +20,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -37,5 +37,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}

View File

@ -20,5 +20,5 @@ class DemoApp {
export function main() {
commonDemoSetup();
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
}