kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inverted and fixed drag scrolling

Browse Source
This commit is contained in:
Kenneth Jao 2017-04-13 02:38:20 -04:00
parent 3ba2cafef0
commit 13b4ee6fcb
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hourglass/client/main/main.html
View File

@ -297,7 +297,7 @@
</div> </div>
<div> <div>
<span class="workTitle">Description:</span><br> <span class="workTitle">Description:</span><br>
<textarea id="wDescription" class="clickModify restrict" style="color:{{divColor 'textColor'}}" value="{{work 'description'}}" rows="5" tabindex="12" maxLength="150"></textarea> <textarea id="wDescription" class="clickModify restrict" style="color:{{divColor 'textColor'}}" value="{{work 'description'}}" rows="5" tabindex="12" maxLength="300"></textarea>
<span style="opacity:0">.</span> <span style="opacity:0">.</span>
<span class="resText">{{restrict 'wDescription'}}</span> <span class="resText">{{restrict 'wDescription'}}</span>
</div> </div>

24
hourglass/client/main/main.js
View File

@ -73,21 +73,25 @@ Template.classesMode.rendered = function() {
$(".mainClass .slimScrollBar").css("display", "none"); $(".mainClass .slimScrollBar").css("display", "none");
// Classes mode drag scrolling // Classes mode drag scrolling
var dX = 0; var area = $("#classesMode");
var currX = 0; var curDown;
var sidebar = $("#classesMode"); var curXPos;
new Hammer(sidebar[0], {
domEvents: true area.mousedown(function(m){
curDown = true;
curXPos = m.pageX;
}); });
sidebar.on('panmove', function(e) { area.mouseup(function(){
dX = currX + (e.originalEvent.gesture.deltaX); curDown = false;
sidebar.scrollLeft(dX);
}); });
sidebar.on('panend', function(e) { area.mousemove(function(m){
currX = dX; if(curDown) {
area.scrollLeft($(window).scrollLeft() + (curXPos - m.pageX));
}
}); });
}; };
// Global Helpers // Global Helpers

9
hourglass/client/mobile/mobile.css
View File

@ -489,6 +489,15 @@
right: 21vw; right: 21vw;
} }
#mDelete {
padding: 3%;
background-color: rgba(255,255,255,0.1);
position: absolute;
bottom: 7vw;
left: 7vw;
}
.mOption { .mOption {
font-size: 3.7vw; font-size: 3.7vw;
width: 92%; width: 92%;

1
hourglass/client/mobile/mobile.html
View File

@ -224,6 +224,7 @@
<i class="fa fa-exclamation-triangle" aria-hidden="true" ></i> <i class="fa fa-exclamation-triangle" aria-hidden="true" ></i>
</div> </div>
<p id="mReportNum" class="mNum">{{work 'reports'}}</p> <p id="mReportNum" class="mNum">{{work 'reports'}}</p>
<!-- <h4 id="mDelete">Delete Work</h4> -->
</template> </template>
<template name="mViewWork"> <template name="mViewWork">

4
hourglass/client/mobile/mobile.js
View File

@ -488,6 +488,10 @@ Template.mEditWork.rendered = function() {
Session.set("select", "type"); Session.set("select", "type");
toggleSidebar(true); toggleSidebar(true);
}); });
/*addMobileButton($("#mDelete"), 0.2, "brightness", function() {
})*/
} }
Template.mAddWork.events({ Template.mAddWork.events({