sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

update geo module

Browse source
This commit is contained in:
rolux 2011-11-23 15:53:17 +01:00
commit e0d4dd3bec
1619 changed files with 6021 additions and 686370 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -925,23 +925,23 @@ Ox.Calendar = function(options, self) {
function mousewheel(e, delta, deltaX, deltaY) {
//Ox.Log('Calendar', 'mousewheel', delta, deltaX, deltaY);
var deltaZ = 0;
if (!self.mousewheel && deltaY && Math.abs(deltaY) > Math.abs(deltaX)) {
if (!self.mousewheel && Math.abs(deltaY) > Math.abs(deltaX)) {
if (deltaY < 0 && self.options.zoom > 0) {
deltaZ = -1;
} else if (deltaY > 0 && self.options.zoom < self.maxZoom) {
deltaZ = 1;
}
if (deltaZ) {
self.options.date = deltaZ == -1 ?
new Date(2 * +self.options.date - +getMouseDate(e)) :
new Date((+self.options.date + +getMouseDate(e)) / 2);
self.options.date = deltaZ == -1
? new Date(2 * +self.options.date - +getMouseDate(e))
: new Date((+self.options.date + +getMouseDate(e)) / 2);
zoomBy(deltaZ);
}
self.mousewheel = true;
setTimeout(function() {
self.mousewheel = false;
}, 250);
}
self.mousewheel = true;
setTimeout(function() {
self.mousewheel = false;
}, 250);
}
function overlaps(eventA, eventB) {