Merge pull request #51 from Polymer/ergo-gesture

Use the new per-element gesture registration
googlearchive · Jul 16, 2014 · 287de28 · 287de28
2 parents a14c2ef + 3f132ef
commit 287de28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/declaration/events.js b/src/declaration/events.js
@@ -84,6 +84,7 @@
 
       return function(model, node, oneTime) {
         var handler = events.getEventHandler(undefined, node, pathString);
+        PolymerGestures.addGesture(node, eventType);
         node.addEventListener(eventType, handler);
 
         if (oneTime)
@@ -101,6 +102,7 @@
           open: bindingValue,
           discardChanges: bindingValue,
           close: function() {
+            PolymerGestures.removeGesture(node, eventType);
             node.removeEventListener(eventType, handler);
           }
         };

diff --git a/src/instance/base.js b/src/instance/base.js
@@ -192,8 +192,6 @@
     shadowRootReady: function(root) {
       // locate nodes with id and store references to them in this.$ hash
       this.marshalNodeReferences(root);
-      // set up polymer gestures
-      PolymerGestures.register(root);
     },
     // locate nodes with id and store references to them in this.$ hash
     marshalNodeReferences: function(root) {

diff --git a/src/instance/events.js b/src/instance/events.js
@@ -28,6 +28,7 @@
       // by default supports 1 thing being bound.
       for (var type in events) {
         var methodName = events[type];
+        PolymerGestures.addGesture(this, type);
         this.addEventListener(type, this.element.getEventHandler(this, this,
                                                                  methodName));
       }