visual and scrolling fixes

This commit is contained in:
Kenneth Jao 2017-04-13 10:59:20 -04:00
parent 6ef36e57f1
commit 9af7fb3cf8
2 changed files with 22 additions and 2 deletions

View File

@ -461,10 +461,16 @@ input {
-webkit-filter: none !important; -webkit-filter: none !important;
filter: none !important; filter: none !important;
pointer-events: none;
} }
.mainClassHour { .mainClassHour {
margin-top: 0; margin-top: 0;
pointer-events: none;
}
.mainClassTeacher {
pointer-events: none;
} }
.creWork { .creWork {

View File

@ -82,6 +82,20 @@ Template.classesMode.rendered = function() {
area.add(new Hammer.Pan({ threshold: 0 })); 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; dX = currX + e.deltaX;
$("#classesMode").scrollLeft(-dX); $("#classesMode").scrollLeft(-dX);
}); });
@ -931,7 +945,7 @@ startDragula = function() {
dragula([document.querySelector('#classesMode'), document.querySelector('#nonexistant')], { dragula([document.querySelector('#classesMode'), document.querySelector('#nonexistant')], {
moves: function(el, container, handle) { moves: function(el, container, handle) {
// return handle.classList.contains("classInfo") || handle.classList.contains("mainClassName"); // 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) { .on('out', function(el) {