Updated to not requestAnimationFrame if no valide mousePosition found

Author: mackenzieajudd

src/ui-layout.js

@@ -176,9 +176,11 @@ angular.module('ui.layout', [])
         (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] : 0) :
-          (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));
+          (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches && mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : null) :
+          (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : null));
 
+      if(mousePos === null) return;
+      
       lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 
       //Cancel previous rAF call

test/uiLayoutCtrl.spec.js

@@ -39,55 +39,65 @@ describe('Controller: uiLayoutCtrl', function () {
 
     describe('mouseMoveHandler', function(){
 
-      var controller, window;
+      var controller, jQueryWindow;
 
       beforeEach(function(){
 
-        window = {};
+        jQueryWindow = {};
+        
+        spyOn(window, 'requestAnimationFrame');
 
         controller = $controller('uiLayoutCtrl', {
           $scope: scope,
           $attrs: {},
           $element: angular.element('<div></div>'),
-          $window: window
+          $window: jQueryWindow
         });
       });
 
       it('should handle standard mouse event without exception', function(){
         var mockMouseEvent = {};
-        mockMouseEvent[controller.sizeProperties.mouseProperty] = 0;
+        mockMouseEvent[controller.sizeProperties.mouseProperty] = 1;
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).toHaveBeenCalled();
       });
 
       it('should handle jQuery mouse event without exception', function(){
         var mockMouseEvent = {
           originalEvent: {}
         };
-        mockMouseEvent.originalEvent[controller.sizeProperties.mouseProperty] = 0;
+        mockMouseEvent.originalEvent[controller.sizeProperties.mouseProperty] = 1;
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).toHaveBeenCalled();
       });
 
       it('should handle standard touch event without exception', function(){
         var mockMouseEvent = {
           targetTouches: []
         };
         mockMouseEvent.targetTouches[0] = {};
-        mockMouseEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 0;
+        mockMouseEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 1;
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).toHaveBeenCalled();
       });
 
       it('should handle unrecognised standard event without exception', function(){
         var mockMouseEvent = {};
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).not.toHaveBeenCalled();
       });
 
       it('should handle jQuery touch event without exception', function(){
 
-        window.jQuery = true;
+        jQueryWindow.jQuery = true;
 
         var mockMouseEvent = {
           originalEvent: {
@@ -96,20 +106,24 @@ describe('Controller: uiLayoutCtrl', function () {
         };
 
         mockMouseEvent.originalEvent.targetTouches[0] = {};
-        mockMouseEvent.originalEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 0;
+        mockMouseEvent.originalEvent.targetTouches[0][controller.sizeProperties.mouseProperty] = 1;
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).toHaveBeenCalled();
       });
 
       it('should handle unrecognised jQuery event without exception', function(){
 
-        window.jQuery = true;
+        jQueryWindow.jQuery = true;
 
         var mockMouseEvent = {
           originalEvent: {}
         };
 
         controller.mouseMoveHandler(mockMouseEvent);
+        
+        expect(window.requestAnimationFrame).toHaveBeenCalled();
       });
     });
   });