Revert "Roll polymer to 0.3.5"

pkg/polymer/lib/src/events.dart

 // Copyright (c) 2013, 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.
 
 /// Code from declaration/events.js
 part of polymer;
 
 /// An extension of [polymer_expressions.PolymerExpressions] that adds support
 /// for binding events using `on-eventName` using [PolymerEventBindings].
 // TODO(jmesserly): the JS layering is a bit odd, with polymer-dev implementing
@@ skipping 70 matching lines @@
   };
 
   prepareEventBinding(String path, String name, Node node) {
     if (!_hasEventPrefix(name)) return null;
 
     var eventType = _removeEventPrefix(name);
     var translated = _eventTranslations[eventType];
     eventType = translated != null ? translated : eventType;
 
     return (model, node, oneTime) {
-      var eventHandler =
-          Zone.current.bindUnaryCallback(getEventHandler(null, node, path));
-      // TODO(jakemac): Remove this indirection if/when JsFunction gets a
-      // simpler constructor that doesn't pass this, http://dartbug.com/20545.
-      var handler = new JsFunction.withThis((_, e) => eventHandler(e));
-      _PolymerGestures.callMethod(
-          'addEventListener', [node, eventType, handler]);
+      var handler = getEventHandler(null, node, path);
+      var sub = node.on[eventType].listen(handler);
 
       if (oneTime) return null;
-      return new _EventBindable(path, node, eventType, handler);
+      return new _EventBindable(sub, path);
     };
   }
 }
 
 
 class _EventBindable extends Bindable {
+  StreamSubscription _sub;
   final String _path;
-  final Node _node;
-  final String _eventType;
-  final JsFunction _handler;
 
-  _EventBindable(this._path, this._node, this._eventType, this._handler);
+  _EventBindable(this._sub, this._path);
 
   // TODO(rafaelw): This is really pointless work. Aside from the cost
   // of these allocations, NodeBind is going to setAttribute back to its
   // current value. Fixing this would mean changing the TemplateBinding
   // binding delegate API.
   get value => '{{ $_path }}';
 
   open(callback) => value;
 
   void close() {
-    _PolymerGestures.callMethod(
-        'removeEventListener', [_node, _eventType, _handler]);
+    if (_sub != null) {
+      _sub.cancel();
+      _sub = null;
+    }
   }
 }
 
 
 /// Attribute prefix used for declarative event handlers.
 const _EVENT_PREFIX = 'on-';
 
 /// Whether an attribute declares an event.
 bool _hasEventPrefix(String attr) => attr.startsWith(_EVENT_PREFIX);
 
@@ skipping 28 matching lines @@
   return map;
 }();
 
 // Dart note: we need this function because we have additional renames JS does
 // not have. The JS renames are simply case differences, whereas we have ones
 // like doubleclick -> dblclick and stripping the webkit prefix.
 String _eventNameFromType(String eventType) {
   final result = _reverseEventTranslations[eventType];
   return result != null ? result : eventType;
 }