From ca36501d724ebe6def95429708100cb13ca3b0f2 Mon Sep 17 00:00:00 2001 From: tomyeh Date: Tue, 29 Oct 2013 14:39:32 +0800 Subject: [PATCH] upgrade to the latest SDK --- lib/effect.dart | 1 - lib/event.dart | 1 - lib/gesture.dart | 1 - lib/layout.dart | 1 - lib/model.dart | 1 - lib/src/view/Style.dart | 7 ++++++- lib/view.dart | 1 - lib/view/select.dart | 1 - pubspec.yaml | 5 +++-- test/TestViewTag.dart | 1 - 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/effect.dart b/lib/effect.dart index 3db3e354..780fe991 100644 --- a/lib/effect.dart +++ b/lib/effect.dart @@ -7,7 +7,6 @@ library rikulo_effect; import "dart:html"; import "dart:math"; -import 'package:meta/meta.dart'; import "package:rikulo_commons/util.dart"; import 'package:rikulo_commons/html.dart'; diff --git a/lib/event.dart b/lib/event.dart index 9b826747..7a1f620f 100644 --- a/lib/event.dart +++ b/lib/event.dart @@ -8,7 +8,6 @@ import "dart:html"; import "dart:async"; import "dart:collection" show HashMap; -import 'package:meta/meta.dart'; import "package:rikulo_commons/util.dart"; import "package:rikulo_commons/async.dart"; import 'package:rikulo_commons/html.dart'; diff --git a/lib/gesture.dart b/lib/gesture.dart index 2aeca589..bb3ac8bc 100644 --- a/lib/gesture.dart +++ b/lib/gesture.dart @@ -8,7 +8,6 @@ import "dart:html"; import "dart:math"; import "dart:async"; -import 'package:meta/meta.dart'; import 'package:rikulo_commons/util.dart'; import 'package:rikulo_commons/html.dart'; diff --git a/lib/layout.dart b/lib/layout.dart index a55e566c..e9ba63d1 100644 --- a/lib/layout.dart +++ b/lib/layout.dart @@ -7,7 +7,6 @@ import "dart:html"; import "dart:math"; import "dart:collection" show HashMap; -import 'package:meta/meta.dart'; import 'package:rikulo_commons/util.dart'; import 'package:rikulo_commons/html.dart'; diff --git a/lib/model.dart b/lib/model.dart index 1cd36162..b4beedde 100644 --- a/lib/model.dart +++ b/lib/model.dart @@ -6,7 +6,6 @@ library rikulo_model; import "dart:async" show Stream; import "dart:collection" show HashMap; -import 'package:meta/meta.dart'; import "package:rikulo_commons/util.dart"; import "package:rikulo_commons/async.dart"; diff --git a/lib/src/view/Style.dart b/lib/src/view/Style.dart index cc393d7e..d2ec10f5 100644 --- a/lib/src/view/Style.dart +++ b/lib/src/view/Style.dart @@ -100,7 +100,7 @@ class Style extends View { out.write(content); out.write(''); } - node.unsafeInnerHtml = out.toString(); + node.setInnerHtml(out.toString(), treeSanitizer: const _NullTreeSanitizer()); } /** Returns false to indicate this view doesn't allow any child views. */ @@ -111,3 +111,8 @@ class Style extends View { @override String get className => "Style"; } + +class _NullTreeSanitizer implements NodeTreeSanitizer { + const _NullTreeSanitizer(); + void sanitizeTree(Node node) {} +} diff --git a/lib/view.dart b/lib/view.dart index 08b710a3..7cff016a 100644 --- a/lib/view.dart +++ b/lib/view.dart @@ -7,7 +7,6 @@ import 'dart:math'; import 'dart:collection'; import 'dart:async' show StreamSubscription, Timer; -import 'package:meta/meta.dart'; import 'package:rikulo_commons/util.dart'; import 'package:rikulo_commons/async.dart'; import 'package:rikulo_commons/html.dart'; diff --git a/lib/view/select.dart b/lib/view/select.dart index 89d5bbe1..a545968c 100644 --- a/lib/view/select.dart +++ b/lib/view/select.dart @@ -3,7 +3,6 @@ library rikulo_view_select; import "dart:collection" show IterableBase; -import "package:meta/meta.dart"; import "../view.dart"; part "../src/view/select/Token.dart"; diff --git a/pubspec.yaml b/pubspec.yaml index 53a244ef..16f52c5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: rikulo_ui -version: 0.7.2 +version: 0.7.3 description: > A cross-platform framework for creating amazing Web and native mobile applications in Dart & HTML5. @@ -12,4 +12,5 @@ documentation: http://docs.rikulo.org/ui dependencies: rikulo_commons: any browser: any - meta: any +environment: + sdk: ">=0.8.7" diff --git a/test/TestViewTag.dart b/test/TestViewTag.dart index 82b8a728..be131610 100644 --- a/test/TestViewTag.dart +++ b/test/TestViewTag.dart @@ -18,7 +18,6 @@ void main() { for (int i = 0; i < 10; ++i) { View li = new View.tag("li"); (li.node as LIElement) - ..type = "i" ..value = i*2 + 1 ..innerHtml = "This is the $i item."; li.top = 22 * i;