Skip to content

Commit 1b6e77c

Browse files
committed
Merge pull request jquery-archive#122 from Polymer/always-enter-leave
Implement spec update for non-hover pointers issuing enter and leave
2 parents f7dd105 + 275d2cb commit 1b6e77c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/dispatcher.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,16 @@
164164
this.fireEvent('pointercancel', inEvent);
165165
},
166166
leaveOut: function(event) {
167+
this.out(event);
167168
if (!this.contains(event.target, event.relatedTarget)) {
168169
this.leave(event);
169170
}
170-
this.out(event);
171171
},
172172
enterOver: function(event) {
173+
this.over(event);
173174
if (!this.contains(event.target, event.relatedTarget)) {
174175
this.enter(event);
175176
}
176-
this.over(event);
177177
},
178178
// LISTENER LOGIC
179179
eventHandler: function(inEvent) {

src/touch.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@
243243
outTarget: inPointer.target
244244
});
245245
dispatcher.over(inPointer);
246+
dispatcher.enter(inPointer);
246247
dispatcher.down(inPointer);
247248
},
248249
touchmove: function(inEvent) {
@@ -292,6 +293,7 @@
292293
if (!this.scrolling) {
293294
dispatcher.up(inPointer);
294295
dispatcher.out(inPointer);
296+
dispatcher.leave(inPointer);
295297
}
296298
this.cleanUpPointer(inPointer);
297299
},
@@ -301,6 +303,7 @@
301303
cancelOut: function(inPointer) {
302304
dispatcher.cancel(inPointer);
303305
dispatcher.out(inPointer);
306+
dispatcher.leave(inPointer);
304307
this.cleanUpPointer(inPointer);
305308
},
306309
cleanUpPointer: function(inPointer) {

0 commit comments

Comments
 (0)