From c48e9fb11abb8ebeff143fdc8a75106dba2752e5 Mon Sep 17 00:00:00 2001 From: Cris Ward Date: Thu, 29 Dec 2016 00:13:09 +0000 Subject: [PATCH] partial fix for firefox scroll --- lib/grid2.js | 7 +++++-- src/grid2.tag | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/grid2.js b/lib/grid2.js index e33d571..d5e70c8 100644 --- a/lib/grid2.js +++ b/lib/grid2.js @@ -228,10 +228,13 @@ this.scrolling = (function(_this) { } else { deltaX = e.deltaX, deltaY = e.deltaY; } - if (vert) { + if (!deltaY) { + deltaY = e.detail * 2; + } + if (vert && deltaY !== 0) { _this.refs.overlay.scrollTop = _this.refs.overlay.scrollTop + deltaY; } - if (horiz) { + if (horiz && deltaX !== 0) { _this.refs.overlay.scrollLeft = _this.refs.overlay.scrollLeft + deltaX; } _this.refs.header.scrollLeft = _this.refs.overlay.scrollLeft; diff --git a/src/grid2.tag b/src/grid2.tag index 7c528c9..6b9d44a 100644 --- a/src/grid2.tag +++ b/src/grid2.tag @@ -200,8 +200,9 @@ grid2 @point = point2 else {deltaX,deltaY} = e - @refs.overlay.scrollTop = @refs.overlay.scrollTop + deltaY if vert - @refs.overlay.scrollLeft = @refs.overlay.scrollLeft + deltaX if horiz + deltaY = e.detail*2 if !deltaY #firefox hack, only works vert + @refs.overlay.scrollTop = @refs.overlay.scrollTop + deltaY if vert && deltaY != 0 + @refs.overlay.scrollLeft = @refs.overlay.scrollLeft + deltaX if horiz && deltaX != 0 @refs.header.scrollLeft = @refs.overlay.scrollLeft @update()