X Tutup
Skip to content

fix(url_resolver): always replace package: in Dart, even if it came… #4775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tbosch wants to merge 1 commit into from
Closed

fix(url_resolver): always replace package: in Dart, even if it came… #4775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions modules/angular2/src/core/compiler/url_resolver.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
library angular2.src.services.url_resolver;

import 'package:angular2/src/core/di.dart' show Injectable;
import 'package:angular2/src/core/di.dart' show Injectable, Provider;

UrlResolver createWithoutPackagePrefix() {
return new UrlResolver.withUrlPrefix(null);
}

@Injectable()
class UrlResolver {
Expand Down Expand Up @@ -28,14 +32,15 @@ class UrlResolver {
*/
String resolve(String baseUrl, String url) {
Uri uri = Uri.parse(url);
if (!uri.isAbsolute) {
Uri baseUri = Uri.parse(baseUrl);
uri = baseUri.resolveUri(uri);
}

if (uri.scheme == 'package') {
if (_packagePrefix != null && uri.scheme == 'package') {
return '$_packagePrefix/${uri.path}';
} else {
return uri.toString();
}

if (uri.isAbsolute) return uri.toString();

Uri baseUri = Uri.parse(baseUrl);
return baseUri.resolveUri(uri).toString();
}
}
5 changes: 5 additions & 0 deletions modules/angular2/src/core/compiler/url_resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ import {isPresent, isBlank, RegExpWrapper, normalizeBlank} from 'angular2/src/co
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
import {ListWrapper} from 'angular2/src/core/facade/collection';

export function createWithoutPackagePrefix(): UrlResolver {
return new UrlResolver();
}


/**
* Used by the {@link Compiler} when resolving HTML and CSS template URLs.
*
Expand Down
4 changes: 3 additions & 1 deletion modules/angular2/test/core/compiler/test_bindings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import {MockSchemaRegistry} from './schema_registry_mock';
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
import {MockXHR} from 'angular2/src/core/compiler/xhr_mock';
import {XHR} from 'angular2/src/core/compiler/xhr';
import {UrlResolver, createWithoutPackagePrefix} from 'angular2/src/core/compiler/url_resolver';

export var TEST_PROVIDERS = [
provide(ElementSchemaRegistry, {useValue: new MockSchemaRegistry({}, {})}),
provide(XHR, {useClass: MockXHR})
provide(XHR, {useClass: MockXHR}),
provide(UrlResolver, {useFactory: createWithoutPackagePrefix})
];
X Tutup