wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 868271 - Don't ignore touchend even if event is preventDefaulted. r=vingtetun

Browse Source
This commit is contained in:
Shih-Chiang Chien 2013-05-14 08:30:37 -04:00
parent 8357f84a81
commit cab6163b26
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom/browser-element/BrowserElementPanning.js
View File

@ -61,8 +61,17 @@ const ContentPanning = {
}, },
handleEvent: function cp_handleEvent(evt) { handleEvent: function cp_handleEvent(evt) {
if (evt.defaultPrevented || evt.multipleActionsPrevented) if (evt.defaultPrevented || evt.multipleActionsPrevented) {
// clean up panning state even if touchend/mouseup has been preventDefault.
if(evt.type === 'touchend' || evt.type === 'mouseup') {
if (this.dragging &&
(this.watchedEventsType === 'mouse' ||
this.findPrimaryPointer(evt.changedTouches))) {
this._finishPanning();
}
}
return; return;
}
switch (evt.type) { switch (evt.type) {
case 'mousedown': case 'mousedown':
@ -206,15 +215,7 @@ const ContentPanning = {
view.addEventListener('click', this, true, true); view.addEventListener('click', this, true, true);
} }
this._resetActive(); this._finishPanning();
this.dragging = false;
this.detectingScrolling = false;
delete this.primaryPointerId;
this._activationTimer.cancel();
if (this.panning) {
KineticPanning.start(this);
}
}, },
// True when there's an async pan-zoom controll watching the // True when there's an async pan-zoom controll watching the
@ -582,6 +583,18 @@ const ContentPanning = {
let ratioH = (aRect.height / vRect.height); let ratioH = (aRect.height / vRect.height);
return (showing > 0.9 && (ratioW > 0.9 || ratioH > 0.9)); return (showing > 0.9 && (ratioW > 0.9 || ratioH > 0.9));
},
_finishPanning: function() {
this._resetActive();
this.dragging = false;
this.detectingScrolling = false;
delete this.primaryPointerId;
this._activationTimer.cancel();
if (this.panning) {
KineticPanning.start(this);
}
} }
}; };