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

Unified Diff: pkg/polymer/lib/polymer.dart

Issue 335943003: merge to trunk all changes from 36817 until 37378 under the packages: polymer, (Closed) Base URL: http://dart.googlecode.com/svn/trunk/dart/
Patch Set: Created 6 years, 6 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 | « pkg/polymer/e2e_test/good_import/test/import_test.html ('k') | pkg/polymer/lib/polymer.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/polymer/lib/polymer.dart
===================================================================
--- pkg/polymer/lib/polymer.dart (revision 37373)
+++ pkg/polymer/lib/polymer.dart (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
@@ -37,14 +37,15 @@
/// Tips for converting your apps from Web UI to Polymer.dart.
library polymer;
-// Last ported from:
-// https://github.com/Polymer/polymer-dev/tree/37eea00e13b9f86ab21c85a955585e8e4237e3d2
-// TODO(jmesserly): we need to do a redundancy check. Some code like the FOUC
-// protection seems out of date, as if left over from the older
-// b7200854b2441a22ce89f6563963f36c50f5150d baseline.
+// Last ported from: Fri May 30 12:45:10 2014 -0700
+// https://github.com/Polymer/polymer-dev/tree/32cc3e470e8ed760a9e596a24fe9b3ac2a87737c
+// Note: we are still missing some tests for new features. Use
+// git diff 37eea00e13b9f86ab21c85a955585e8e4237e3d2 test
+// from polymer-dev to see the changes.
+
import 'dart:async';
-import 'dart:collection' show HashMap, HashSet;
+import 'dart:collection';
import 'dart:html';
import 'dart:js' as js show context;
import 'dart:js' hide context;
@@ -72,17 +73,20 @@
import 'package:observe/observe.dart';
import 'package:observe/src/dirty_check.dart' show dirtyCheckZone;
import 'package:polymer_expressions/polymer_expressions.dart'
- show PolymerExpressions;
+ as polymer_expressions;
import 'package:smoke/smoke.dart' as smoke;
import 'package:template_binding/template_binding.dart';
+import 'auto_binding.dart';
import 'deserialize.dart' as deserialize;
import 'src/mirror_loader.dart' as loader; // ** see important note above
export 'package:observe/observe.dart';
export 'package:observe/html.dart';
+export 'auto_binding.dart';
part 'src/declaration.dart';
+part 'src/events.dart';
part 'src/instance.dart';
part 'src/job.dart';
part 'src/loader.dart';
« no previous file with comments | « pkg/polymer/e2e_test/good_import/test/import_test.html ('k') | pkg/polymer/lib/polymer.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698