Fixed mouseMoveHandler to handle mouse position of 0

mackenzieajudd · Apr 20, 2016 · e151379 · e151379
1 parent 19fa58b
commit e151379
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/ui-layout.js b/src/ui-layout.js
@@ -172,13 +172,13 @@ angular.module('ui.layout', [])
     };
 
     ctrl.mouseMoveHandler = function(mouseEvent) {
-      var mousePos = mouseEvent[ctrl.sizeProperties.mouseProperty] ||
-        (mouseEvent.originalEvent && mouseEvent.originalEvent[ctrl.sizeProperties.mouseProperty]) ||
-        // jQuery does touches weird, see #82
-        ($window.jQuery ?
-          (mouseEvent.originalEvent ? (mouseEvent.originalEvent.targetTouches && mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty]) : null) :
-          (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : null));
 
+      var mousePos = ctrl.sizeProperties.mouseProperty in mouseEvent ? mouseEvent[ctrl.sizeProperties.mouseProperty] 
+                      : mouseEvent.originalEvent && ctrl.sizeProperties.mouseProperty in mouseEvent.originalEvent ? mouseEvent.originalEvent[ctrl.sizeProperties.mouseProperty]
+                      : mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty]
+                      : mouseEvent.originalEvent && mouseEvent.originalEvent.targetTouches ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty]
+                      : null;
+
       if(mousePos === null) return;
 
       lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];

diff --git a/test/uiLayoutCtrl.spec.js b/test/uiLayoutCtrl.spec.js
@@ -57,7 +57,7 @@ describe('Controller: uiLayoutCtrl', function () {
 
       it('should handle standard mouse event without exception', function(){
         var mockMouseEvent = {};
-        mockMouseEvent[controller.sizeProperties.mouseProperty] = 1;
+        mockMouseEvent[controller.sizeProperties.mouseProperty] = 0;
 
         controller.mouseMoveHandler(mockMouseEvent);
 
@@ -68,7 +68,7 @@ describe('Controller: uiLayoutCtrl', function () {
         var mockMouseEvent = {
           originalEvent: {}
         };
-        mockMouseEvent.originalEvent[controller.sizeProperties.mouseProperty] = 1;
+        mockMouseEvent.originalEvent[controller.sizeProperties.mouseProperty] = 0;
 
         controller.mouseMoveHandler(mockMouseEvent);
 
@@ -80,7 +80,7 @@ describe('Controller: uiLayoutCtrl', function () {
           targetTouches: []
         };
         mockMouseEvent.targetTouches[0] = {};
-        mockMouseEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 1;
+        mockMouseEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 0;
 
         controller.mouseMoveHandler(mockMouseEvent);
 
@@ -106,7 +106,7 @@ describe('Controller: uiLayoutCtrl', function () {
         };
 
         mockMouseEvent.originalEvent.targetTouches[0] = {};
-        mockMouseEvent.originalEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 1;
+        mockMouseEvent.originalEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 0;
 
         controller.mouseMoveHandler(mockMouseEvent);
 
@@ -123,7 +123,7 @@ describe('Controller: uiLayoutCtrl', function () {
 
         controller.mouseMoveHandler(mockMouseEvent);
 
-        expect(window.requestAnimationFrame).toHaveBeenCalled();
+        expect(window.requestAnimationFrame).not.toHaveBeenCalled();
       });
     });
   });