Merge from master

esteladiaz · Jul 17, 2014 · bb9aa15 · bb9aa15
2 parents 2fbb803 + 6568727
commit bb9aa15
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/sketch.js b/js/sketch.js
@@ -181,6 +181,8 @@
                     pointer, 'mousemove', 'touchmove',
                     pointer, 'mouseup', 'touchend',
                     pointer, 'click',
+                    pointer, 'mouseout',
+                    pointer, 'mouseover',
 
                 doc,
 
@@ -293,8 +295,8 @@
 
                 bounds = target.getBoundingClientRect();
 
-                touch.x = touch.pageX - bounds.left - win.scrollX;
-                touch.y = touch.pageY - bounds.top - win.scrollY;
+                touch.x = touch.pageX - bounds.left - (win.scrollX || win.pageXOffset);
+                touch.y = touch.pageY - bounds.top - (win.scrollY || win.pageYOffset);
 
                 return touch;
             }