|
|
@ -78,7 +78,7 @@ Range.prototype = new Component(); |
|
|
|
Range.prototype.setOptions = function (options) { |
|
|
|
if (options) { |
|
|
|
// copy the options that we know
|
|
|
|
var fields = ['direction', 'min', 'max', 'zoomMin', 'zoomMax', 'moveable', 'zoomable', 'activate', 'hiddenDates']; |
|
|
|
var fields = ['direction', 'min', 'max', 'zoomMin', 'zoomMax', 'moveable', 'zoomable', 'activate', 'hiddenDates', 'zoomKey']; |
|
|
|
util.selectiveExtend(fields, this.options, options); |
|
|
|
|
|
|
|
if ('start' in options || 'end' in options) { |
|
|
@ -474,6 +474,9 @@ Range.prototype._onMouseWheel = function(event) { |
|
|
|
|
|
|
|
// only zoom when the mouse is inside the current range
|
|
|
|
if (!this._isInsideRange(event)) return; |
|
|
|
|
|
|
|
// only zoom when the according key is pressed and the zoom_key option is set
|
|
|
|
if (this.options.zoomKey && !event[this.options.zoomKey]) return; |
|
|
|
|
|
|
|
// retrieve delta
|
|
|
|
var delta = 0; |
|
|
|