Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: sky/framework/fn.dart

Issue 1006053002: Allow Effen Styles to be extendable (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: sdfsd Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/framework/editing/editable_text.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/framework/fn.dart
diff --git a/sky/framework/fn.dart b/sky/framework/fn.dart
index 12bcb888f4cf2b0d6c7c850c218830d8bf0a17c1..6b5630882e57eb27ea393829cfa58df1a7a760d5 100644
--- a/sky/framework/fn.dart
+++ b/sky/framework/fn.dart
@@ -46,23 +46,25 @@ class Style {
final String _className;
static final Map<String, Style> _cache = new HashMap<String, Style>();
- static int nextStyleId = 1;
+ static int _nextStyleId = 1;
- static String nextClassName(String styles) {
- assert(sky.document != null);
- String className = "style$nextStyleId";
- nextStyleId++;
+ static String _getNextClassName() { return "style${_nextStyleId++}"; }
- sky.Element styleNode = sky.document.createElement('style');
- styleNode.setChild(new sky.Text(".$className { $styles }"));
- sky.document.appendChild(styleNode);
+ Style extend(Style other) {
+ var className = "$_className ${other._className}";
- return className;
+ return _cache.putIfAbsent(className, () {
+ return new Style._internal(className);
+ });
}
factory Style(String styles) {
return _cache.putIfAbsent(styles, () {
- return new Style._internal(nextClassName(styles));
+ var className = _getNextClassName();
+ sky.Element styleNode = sky.document.createElement('style');
+ styleNode.setChild(new sky.Text(".$className { $styles }"));
+ sky.document.appendChild(styleNode);
+ return new Style._internal(className);
});
}
@@ -140,11 +142,11 @@ abstract class Element extends Node {
Element({
Object key,
List<Node> children,
- List<Style> styles,
+ Style style,
this.inlineStyle
}) : super(key:key) {
- _class = styles == null ? '' : styles.map((s) => s._className).join(' ');
+ _class = style == null ? '' : style._className;
_children = children == null ? _emptyList : children;
if (_isInCheckedMode) {
@@ -412,12 +414,12 @@ class Container extends Element {
Container({
Object key,
List<Node> children,
- List<Style> styles,
+ Style style,
String inlineStyle
}) : super(
key: key,
children: children,
- styles: styles,
+ style: style,
inlineStyle: inlineStyle
);
}
@@ -436,7 +438,7 @@ class Image extends Element {
Image({
Object key,
List<Node> children,
- List<Style> styles,
+ Style style,
String inlineStyle,
this.width,
this.height,
@@ -444,7 +446,7 @@ class Image extends Element {
}) : super(
key: key,
children: children,
- styles: styles,
+ style: style,
inlineStyle: inlineStyle
);
@@ -480,7 +482,7 @@ class Anchor extends Element {
Anchor({
Object key,
List<Node> children,
- List<Style> styles,
+ Style style,
String inlineStyle,
this.width,
this.height,
@@ -488,7 +490,7 @@ class Anchor extends Element {
}) : super(
key: key,
children: children,
- styles: styles,
+ style: style,
inlineStyle: inlineStyle
);
« no previous file with comments | « sky/framework/editing/editable_text.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698