Permalink
Browse files

new build

  • Loading branch information...
garris committed Apr 9, 2015
1 parent fcead4e commit 1c3129ae1ad1bb64cb3f6ab9ec6150cec6333163
Showing with 9 additions and 10 deletions.
  1. +8 −9 dist/Tremula.js
  2. +1 −1 dist/Tremula.min.js
View
@@ -3237,7 +3237,7 @@ define('Grid',[
case 'dragleft':
// === manually block page scroll ===
// === manually block cross axis page scroll ===
// if in horizontal config and the user is scrolling horizontally
// or if in vertical config and the user is scrolling vertically
@@ -3249,20 +3249,17 @@ define('Grid',[
}else if(this.sx){//is horizontal config
// if(ev.gesture.deltaX != 0){//this old bit was recently disabled
if(Math.abs(ev.gesture.deltaY/ev.gesture.deltaX) <= 1){ // if this ratio is 1 or less then the user is scrolling the scroll axis: so block native events
//ignore firefox DOMMouseScroll events
if(!/DOMMouseScroll/.test(ev.type) && Math.abs(ev.gesture.deltaY/ev.gesture.deltaX) <= 1){ // if this ratio is 1 or less then the user is scrolling the scroll axis: so block native events
shuntEvent(ev);
}
// }
}else{// is vertical config
// if(ev.gesture.deltaY != 0){//this old bit was recently disabled -- not needed now?
if(Math.abs(ev.gesture.deltaX/ev.gesture.deltaY) <= 1){ // if this ratio is 1 or less then the user is scrolling the scroll axis: so block native events
//ignore firefox DOMMouseScroll events
if(!/DOMMouseScroll/.test(ev.type) && Math.abs(ev.gesture.deltaX/ev.gesture.deltaY) <= 1){ // if this ratio is 1 or less then the user is scrolling the scroll axis: so block native events
shuntEvent(ev);
}
// }
}// config case
// === END: manually block page scroll ===
@@ -3274,7 +3271,9 @@ define('Grid',[
if(!this.getLastSelected())
this.setLastSelected(this.getClosestScrollOriginObj());
//incase we are at the begining of a touch event or incase this is a fallthrough WheelEvent
if(fingeredOffset==0 || /wheel|scroll/.test(ev.type)){
fingeredOffset = this.scrollPos;
Oops, something went wrong.

0 comments on commit 1c3129a

Please sign in to comment.