diff --git a/build/js/jquery.mousewheel.js b/build/js/jquery.mousewheel.js
new file mode 100755
index 00000000..b7932415
--- /dev/null
+++ b/build/js/jquery.mousewheel.js
@@ -0,0 +1,78 @@
+/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.4
+ *
+ * Requires: 1.2.2+
+ */
+
+(function($) {
+
+var types = ['DOMMouseScroll', 'mousewheel'];
+
+$.event.special.mousewheel = {
+ setup: function() {
+ if ( this.addEventListener ) {
+ for ( var i=types.length; i; ) {
+ this.addEventListener( types[--i], handler, false );
+ }
+ } else {
+ this.onmousewheel = handler;
+ }
+ },
+
+ teardown: function() {
+ if ( this.removeEventListener ) {
+ for ( var i=types.length; i; ) {
+ this.removeEventListener( types[--i], handler, false );
+ }
+ } else {
+ this.onmousewheel = null;
+ }
+ }
+};
+
+$.fn.extend({
+ mousewheel: function(fn) {
+ return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
+ },
+
+ unmousewheel: function(fn) {
+ return this.unbind("mousewheel", fn);
+ }
+});
+
+
+function handler(event) {
+ var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
+ event = $.event.fix(orgEvent);
+ event.type = "mousewheel";
+
+ // Old school scrollwheel delta
+ if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
+ if ( event.detail ) { delta = -event.detail/3; }
+
+ // New school multidimensional scroll (touchpads) deltas
+ deltaY = delta;
+
+ // Gecko
+ if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+ deltaY = 0;
+ deltaX = -1*delta;
+ }
+
+ // Webkit
+ if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
+ if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
+
+ // Add event and delta to the front of the arguments
+ args.unshift(event, delta, deltaX, deltaY);
+
+ return $.event.handle.apply(this, args);
+}
+
+})(jQuery);
\ No newline at end of file
diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index 7f2ae924..dcc427bb 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -10984,6 +10984,7 @@ requires
top: '24px',
bottom: '40px'
})
+ .mousewheel(mousewheel)
.bindEvent({
dragstart: dragstart,
drag: drag,
@@ -10994,7 +10995,7 @@ requires
self.$content = new Ox.Element()
.addClass('OxCalendarContent')
- .appendTo(self.$container)
+ .appendTo(self.$container);
self.$scalebar = new Ox.Element()
.addClass('OxTimeline')
@@ -11209,6 +11210,20 @@ requires
return $elements;
}
+ function mousewheel(event, delta, deltaX, deltaY) {
+ Ox.print('mousewheel', delta, deltaX, deltaY);
+ if (!self.mousewheel && deltaY && Math.abs(deltaY) > Math.abs(deltaX)) {
+ self.options.zoom += deltaY < 0 ? -1 : 1;
+ $('.OxDate').remove();
+ renderTimelines();
+ renderDates();
+ }
+ self.mousewheel = true;
+ setTimeout(function() {
+ self.mousewheel = false;
+ }, 250);
+ }
+
function overlaps(date0, date1) {
return (
date0.start >= date1.start && date0.start < date1.stop
diff --git a/demos/calendar/index.html b/demos/calendar/index.html
index 55080e00..999c5e00 100644
--- a/demos/calendar/index.html
+++ b/demos/calendar/index.html
@@ -5,6 +5,7 @@
+
diff --git a/demos/mouse/js/mouse.js b/demos/mouse/js/mouse.js
index 4eb376ce..d2e60c75 100644
--- a/demos/mouse/js/mouse.js
+++ b/demos/mouse/js/mouse.js
@@ -51,6 +51,7 @@ $(function() {
} : {}))
)
.prependTo($log.$element);
+ event == 'anyclick' && Ox.print(e);
});
});
});
\ No newline at end of file