Skip to content

Commit 1a05a02

Browse files
committed
fix(useNgBaseCss): Fix up the merge
1 parent e92ee97 commit 1a05a02

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/core_dom/shadow_dom_component_factory.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ class _ComponentFactory implements Function {
9494
// so change back to using @import once Chrome bug is fixed or a
9595
// better work around is found.
9696
Iterable<async.Future<dom.StyleElement>> cssFutures;
97-
var cssUrls = []..addAll(_baseCss.urls)..addAll(component.cssUrls);
97+
var cssUrls = _baseCss != null ?
98+
([]..addAll(_baseCss.urls)..addAll(component.cssUrls)) :
99+
component.cssUrls;
98100
if (cssUrls.isNotEmpty) {
99101
cssFutures = cssUrls.map((cssUrl) => _styleElementCache.putIfAbsent(cssUrl, () =>
100102
http.get(cssUrl, cache: templateCache)

0 commit comments

Comments
 (0)