fix(url_resolver): in Dart make package urls relative to AppRootUrl
This commit is contained in:
@ -37,5 +37,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -20,5 +20,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -2,22 +2,12 @@ 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 {
|
||||
|
||||
@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);
|
||||
}
|
||||
DemoUrlResolver(AppRootUrl appRootUrl) : super(appRootUrl);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ export function commonDemoSetup(): void {
|
||||
@Injectable()
|
||||
export class DemoUrlResolver extends UrlResolver {
|
||||
constructor() {
|
||||
super();
|
||||
super(null);
|
||||
}
|
||||
|
||||
resolve(baseUrl: string, url: string): string {
|
||||
|
@ -92,5 +92,5 @@ class SimpleDialogComponent {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -18,5 +18,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -12,5 +12,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -20,5 +20,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -37,5 +37,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
@ -20,5 +20,5 @@ class DemoApp {
|
||||
|
||||
export function main() {
|
||||
commonDemoSetup();
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toValue(new DemoUrlResolver())]);
|
||||
bootstrap(DemoApp, [bind(UrlResolver).toClass(DemoUrlResolver)]);
|
||||
}
|
||||
|
Reference in New Issue
Block a user