diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index d960a8189..d9ec92aad 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -120,7 +120,7 @@ this.scrollClassContainer=this.options.scrollClassContainer?$(this.options.scrol if(this.options.scrollMarkerContainer) $(this.options.scrollMarkerContainer).append($('')) $el.mousewheel(function(event){if(!self.options.allowScroll) -return;var offset=self.options.vertical?((event.deltaFactor*event.deltaY)*-1):((event.deltaFactor*event.deltaX)*-1) +return;var offset=self.options.vertical?((event.deltaFactor*event.deltaY)*-1):(event.deltaFactor*event.deltaX) return!scrollWheel(offset)}) $el.on('mousedown',function(event){startDrag(event) return false}) @@ -788,7 +788,7 @@ if(isTouch){this.$el.on('touchstart',function(event){var touchEvent=event.origin event.stopPropagation()}})} else{this.$thumb.on('mousedown',function(event){startDrag(event)}) this.$track.on('mouseup',function(event){moveDrag(event)})} -$el.mousewheel(function(event){var offset=self.options.vertical?((event.deltaFactor*event.deltaY)*-1):((event.deltaFactor*event.deltaX)*-1) +$el.mousewheel(function(event){var offset=self.options.vertical?((event.deltaFactor*event.deltaY)*-1):(event.deltaFactor*event.deltaX) return!scrollWheel(offset*self.options.scrollSpeed)}) $el.on('oc.scrollbar.gotoStart',function(event){self.options.vertical?$el.scrollTop(0):$el.scrollLeft(0) self.update() diff --git a/modules/backend/assets/js/october.dragscroll.js b/modules/backend/assets/js/october.dragscroll.js index c7436e705..c2ccef89e 100644 --- a/modules/backend/assets/js/october.dragscroll.js +++ b/modules/backend/assets/js/october.dragscroll.js @@ -60,7 +60,7 @@ var offset = self.options.vertical ? ((event.deltaFactor * event.deltaY) * -1) - : ((event.deltaFactor * event.deltaX) * -1) + : (event.deltaFactor * event.deltaX) return !scrollWheel(offset) }) diff --git a/modules/backend/assets/js/october.scrollbar.js b/modules/backend/assets/js/october.scrollbar.js index cbc95db3c..14f09e920 100644 --- a/modules/backend/assets/js/october.scrollbar.js +++ b/modules/backend/assets/js/october.scrollbar.js @@ -68,7 +68,7 @@ $el.mousewheel(function (event){ var offset = self.options.vertical ? ((event.deltaFactor * event.deltaY) * -1) - : ((event.deltaFactor * event.deltaX) * -1) + : (event.deltaFactor * event.deltaX) return !scrollWheel(offset * self.options.scrollSpeed) })