Merge pull request #122 from Polymer/always-enter-leave

Implement spec update for non-hover pointers issuing enter and leave
jquery-archive · Jan 27, 2014 · 1b6e77c · 1b6e77c
2 parents f7dd105 + 275d2cb
commit 1b6e77c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/dispatcher.js b/src/dispatcher.js
@@ -164,16 +164,16 @@
       this.fireEvent('pointercancel', inEvent);
     },
     leaveOut: function(event) {
+      this.out(event);
       if (!this.contains(event.target, event.relatedTarget)) {
         this.leave(event);
       }
-      this.out(event);
     },
     enterOver: function(event) {
+      this.over(event);
       if (!this.contains(event.target, event.relatedTarget)) {
         this.enter(event);
       }
-      this.over(event);
     },
     // LISTENER LOGIC
     eventHandler: function(inEvent) {

diff --git a/src/touch.js b/src/touch.js
@@ -243,6 +243,7 @@
         outTarget: inPointer.target
       });
       dispatcher.over(inPointer);
+      dispatcher.enter(inPointer);
       dispatcher.down(inPointer);
     },
     touchmove: function(inEvent) {
@@ -292,6 +293,7 @@
       if (!this.scrolling) {
         dispatcher.up(inPointer);
         dispatcher.out(inPointer);
+        dispatcher.leave(inPointer);
       }
       this.cleanUpPointer(inPointer);
     },
@@ -301,6 +303,7 @@
     cancelOut: function(inPointer) {
       dispatcher.cancel(inPointer);
       dispatcher.out(inPointer);
+      dispatcher.leave(inPointer);
       this.cleanUpPointer(inPointer);
     },
     cleanUpPointer: function(inPointer) {