summaryrefslogtreecommitdiff
path: root/public/assets/js/lib/Scroller.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/js/lib/Scroller.js')
-rw-r--r--public/assets/js/lib/Scroller.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/public/assets/js/lib/Scroller.js b/public/assets/js/lib/Scroller.js
index b88ec0f..f5b75f2 100644
--- a/public/assets/js/lib/Scroller.js
+++ b/public/assets/js/lib/Scroller.js
@@ -29,12 +29,16 @@ var Scroller = (function(){
var touchGalleryScrubDistance = 100
var $items = $("#items")[0]
function touchstart (e) {
+ // console.log(e.target, e.currentTarget)
+ if (document.body.classList.contains("navopen")) return
+ if (e.target.className == "index" || e.target.id == "burger") return
+ if (e.target.nodeName == "rect" || e.target.nodeName == "g") return
+
touching = true
touchStartTime = +(new Date)
touchStartY = touchEndY = e.touches ? e.touches[0].pageY : e.pageY
touchStartX = touchEndX = e.touches ? e.touches[0].pageX : e.pageX
touchDistY = touchDistX = 0
-// $items.className = "no-tween"
}
function touchmove (e) {
if (! touching) return
@@ -58,7 +62,7 @@ var Scroller = (function(){
var timestamp = +(new Date)
var duration = timestamp - touchStartTime
- console.log("DURATION >>", duration, touchDistY, touchDistX)
+ // console.log("DURATION >>", duration, touchDistY, touchDistX)
if (touchAbsX > touchGalleryScrubDistance) {
return
@@ -132,7 +136,7 @@ var Scroller = (function(){
}
}
function keydown (e) {
- console.log(e.keyCode)
+ // console.log(e.keyCode)
switch (e.keyCode) {
case 37: // left
e.preventDefault()