From 9af7fb3cf83291008afe3bde3359736a0ca2199a Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Thu, 13 Apr 2017 10:59:20 -0400 Subject: [PATCH] visual and scrolling fixes --- hourglass/client/main/main.css | 6 ++++++ hourglass/client/main/main.js | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index 2cd7cd4..1ce7c0e 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -461,10 +461,16 @@ input { -webkit-filter: none !important; filter: none !important; + pointer-events: none; } .mainClassHour { margin-top: 0; + pointer-events: none; +} + +.mainClassTeacher { + pointer-events: none; } .creWork { diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 0499fe8..2af258a 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -81,7 +81,21 @@ Template.classesMode.rendered = function() { area.add(new Hammer.Pan({ threshold: 0 })); - area.on('panmove', function(e) { + area.on('panmove', function(e) { + if(e.srcEvent.srcElement.className === "classInfo") { + /*if(e.srcEvent.pageX <= .06*screen.width) { + dX = currX + 5; + $("#classesMode").scrollLeft(-dX); + return; + } else if(e.srcEvent.pageX >= window.innerWidth-.06*screen.width) { + dX = currX + 5; + $("#classesMode").scrollLeft(dX); + return; + } else { + return; + }*/ + return; + } dX = currX + e.deltaX; $("#classesMode").scrollLeft(-dX); }); @@ -931,7 +945,7 @@ startDragula = function() { dragula([document.querySelector('#classesMode'), document.querySelector('#nonexistant')], { moves: function(el, container, handle) { // return handle.classList.contains("classInfo") || handle.classList.contains("mainClassName"); - return _.intersection(["classInfo", "mainClassName", "mainClassHour", "mainClassTeacher"], handle.classList).length > 0; + return _.intersection(["classInfo"], handle.classList).length > 0; } }) .on('out', function(el) {