TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #358 - Main menu / Tabs no longer use inverted scrolling when horizontal

This commit is contained in:
Samuel Georges 2015-03-26 22:06:01 +11:00
parent 5503705576
commit 5f9acc2e8d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/backend/assets/js/october-min.js vendored
View File

@ -120,7 +120,7 @@ this.scrollClassContainer=this.options.scrollClassContainer?$(this.options.scrol
if(this.options.scrollMarkerContainer)
$(this.options.scrollMarkerContainer).append($('<span class="before scroll-marker"></span><span class="after scroll-marker"></span>'))
$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()

2
modules/backend/assets/js/october.dragscroll.js
View File

@ -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)
})

2
modules/backend/assets/js/october.scrollbar.js
View File

@ -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)
})