Merge branch 'master' into doc/api

This commit is contained in:
Garen Torikian 2012-02-23 13:15:05 -08:00
commit d80ed19f65
325 changed files with 473 additions and 3145 deletions

View file

@ -174,20 +174,9 @@ else {
}
exports.addMouseWheelListener = function(el, callback) {
var max = 0;
var factor = 8;
var listener = function(e) {
if (e.wheelDelta !== undefined) {
// some versions of Safari (e.g. 5.0.5) report insanely high
// scroll values. These browsers require a higher factor
if (Math.abs(e.wheelDeltaY) > max)
max = Math.abs(e.wheelDeltaY);
if (max > 5000)
var factor = 400;
else
var factor = 8;
if (e.wheelDeltaX !== undefined) {
e.wheelX = -e.wheelDeltaX / factor;
e.wheelY = -e.wheelDeltaY / factor;