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

Backed out changeset 83c0cc5c14db

Browse Source
This commit is contained in:
Matt Brubeck 2010-08-17 14:49:31 -07:00
parent 511418864a
commit 2f1d561c5e
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mobile/chrome/content/InputHandler.js
View File

@ -27,7 +27,6 @@
* Gavin Sharp <gavin.sharp@gmail.com>
* Ben Combee <combee@mozilla.com>
* Roy Frostig <rfrostig@mozilla.com>
* Matt Brubeck <mbrubeck@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -58,9 +57,6 @@ const kAxisLockRevertThreshold = 200;
// Same as NS_EVENT_STATE_ACTIVE from nsIEventStateManager.h
const kStateActive = 0x00000001;
// threshold in ms for touch and hold to stop kinetic scrolling
const kKineticBrakesDelay = 50;
/**
* InputHandler
*
@ -433,13 +429,10 @@ MouseModule.prototype = {
let [targetScrollbox, targetScrollInterface]
= this.getScrollboxFromElement(aEvent.target);
if (this._kinetic.isActive()) {
let oldInterface = this._targetScrollInterface;
if (targetScrollInterface != oldInterface)
this._kinetic.end(); // stop right away if targetScrollbox has changed
else
this._kinetic.brakesApplied(); // otherwise, stop soon
}
// stop kinetic panning if targetScrollbox has changed
let oldInterface = this._targetScrollInterface;
if (this._kinetic.isActive() && targetScrollInterface != oldInterface)
this._kinetic.end();
let targetClicker = this.getClickerFromElement(aEvent.target);
@ -993,11 +986,6 @@ KineticController.prototype = {
this._timer = null;
}
if (this._brakesTimeout) {
clearTimeout(this._brakesTimeout);
delete this._brakesTimeout;
}
this.momentumBuffer = [];
this._velocity.set(0, 0);
},
@ -1147,20 +1135,6 @@ KineticController.prototype = {
}
this.momentumBuffer.push({'t': now, 'dx' : dx, 'dy' : dy});
if (dx > 0 && dy > 0 && this._brakesTimeout) {
clearTimeout(this._brakesTimeout);
delete this._brakesTimeout;
}
},
/** Stop panning very soon if no more movement is added. */
brakesApplied: function brakesApplied() {
let self = this;
this._brakesTimeout = setTimeout(function() {
self.end();
delete self._brakesTimeout;
}, kKineticBrakesDelay);
}
};