fixed #1509 correct a bug for MouseMove

Author: dingpinglv

cocos2d/layers_scenes_transitions_nodes/CCLayer.js

@@ -44,6 +44,7 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
     _isKeyboardEnabled:false,
     _touchPriority:0,
     _touchMode:cc.TOUCH_ALL_AT_ONCE,
+    _isMouseEnabled:false,
 
     /**
      * Constructor
@@ -62,6 +63,7 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
         this.setContentSize(director.getWinSize());
         this._isTouchEnabled = false;
         this._isAccelerometerEnabled = false;
+        this._isMouseEnabled = false;
         this._touchMode = cc.TOUCH_ALL_AT_ONCE;
         this._touchPriority = 0;
     },
@@ -92,6 +94,19 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
             cc.Director.getInstance().getTouchDispatcher().addTargetedDelegate(this, this._touchPriority, true);
     },
 
+    isMouseEnabled:function(){
+       return this._isMouseEnabled;
+    },
+
+    setMouseEnabled:function(enabled){
+        if(this._isMouseEnabled != enabled){
+            this._isMouseEnabled = enabled;
+            if(this._isRunning){
+
+            }
+        }
+    },
+
     /**
      * whether or not it will receive Touch events.<br/>
      * You can enable / disable touch events with this property.<br/>
@@ -343,6 +358,56 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
     },
 
     didAccelerate:function (pAccelerationValue) {
+    },
+
+    // ---------------------CCMouseEventDelegate interface------------------------------
+
+    //
+    // left
+    //
+    onMouseDown:function(event){
+    },
+
+    onMouseDragged:function(event){
+    },
+
+    onMouseMoved : function(event){
+    },
+
+    onMouseUp:function(event){
+    },
+
+    //right
+
+    onRightMouseDown : function(event){
+    },
+
+    onRightMouseDragged : function(event){
+    },
+
+    onRightMouseUp : function( event ){
+    },
+
+    //other
+    onOtherMouseDown : function(event){
+    },
+
+    onOtherMouseDragged : function( event){
+    },
+
+    onOtherMouseUp:function(event){
+    },
+
+    //scroll wheel
+    onScrollWheel : function( event){
+    },
+
+    // enter / exit
+
+    onMouseEntered:function(theEvent){
+    },
+
+    onMouseExited:function(theEvent){
     }
 });
 

cocos2d/touch_dispatcher/CCTouchDispatcher.js

@@ -121,6 +121,7 @@ cc.TouchHandlerHelperData = function (type) {
  * @extends cc.Class
  */
 cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */{
+    _mousePressed:false,
     _targetedHandlers:null,
     _standardHandlers:null,
     _locked:false,
@@ -146,10 +147,19 @@ cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */{
         this._toAdd = false;
         this._toQuit = false;
         this._locked = false;
+        this._mousePressed = false;
         cc.TouchDispatcher.registerHtmlElementEvent(cc.canvas);
         return true;
     },
 
+    _setMousePressed:function (pressed) {
+        this._mousePressed = pressed;
+    },
+
+    _getMousePressed:function () {
+        return this._mousePressed;
+    },
+
     /**
      * Whether or not the events are going to be dispatched. Default: true
      * @return {Boolean}
@@ -350,7 +360,12 @@ cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */{
                         claimed = true;
                         switch (helper.type) {
                             case cc.TOUCH_MOVED:
-                                handler.getDelegate().onTouchMoved(touch, event);
+                                if (cc.Browser.isMobile) {
+                                    handler.getDelegate().onTouchMoved(touch, event);
+                                } else {
+                                    if (this._mousePressed)
+                                        handler.getDelegate().onTouchMoved(touch, event);
+                                }
                                 break;
                             case cc.TOUCH_ENDED:
                                 handler.getDelegate().onTouchEnded(touch, event);
@@ -394,7 +409,12 @@ cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */{
                         break;
                     case cc.TOUCH_MOVED:
                         if (mutableTouches.length > 0) {
-                            handler.getDelegate().onTouchesMoved(mutableTouches, event);
+                            if (cc.Browser.isMobile) {
+                                handler.getDelegate().onTouchesMoved(mutableTouches, event);
+                            } else {
+                                if (this._mousePressed)
+                                    handler.getDelegate().onTouchesMoved(mutableTouches, event);
+                            }
                         }
                         break;
                     case cc.TOUCH_ENDED:
@@ -606,6 +626,14 @@ cc.TouchDispatcher.registerHtmlElementEvent = function (element) {
         return;
 
     if (!cc.Browser.isMobile) {
+        window.addEventListener('mousedown', function (event) {
+            cc.Director.getInstance().getTouchDispatcher()._setMousePressed(true);
+        });
+
+        window.addEventListener('mouseup', function (event) {
+            cc.Director.getInstance().getTouchDispatcher()._setMousePressed(false);
+        });
+
         //register canvas mouse event
         element.addEventListener("mousedown", function (event) {
             var pos = cc.getHTMLElementPosition(element);
@@ -654,6 +682,10 @@ cc.TouchDispatcher.registerHtmlElementEvent = function (element) {
 
             cc.Director.getInstance().getTouchDispatcher().touchesMoved(posArr, null);
         });
+
+        element.addEventListener("mousewheel",function(event){
+
+        }, false);
     } else {
         //register canvas touch event
         element.addEventListener("touchstart", function (event) {