Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2227_SyncScrollView

Author: dingpinglv

cocos2d/touch_dispatcher/CCMouseDispatcher.js

@@ -434,11 +434,12 @@ cc.MouseDispatcher = cc.Class.extend({
     },
 
     _findHandler:function (delegate) {
-        for (i = 0; i < this._mouseDelegateHandlers.length; i++) {
+        for (var i = 0; i < this._mouseDelegateHandlers.length; i++) {
             if (this._mouseDelegateHandlers[i] && this._mouseDelegateHandlers[i].getDelegate() == delegate) {
                 return this._mouseDelegateHandlers[i];
             }
         }
+        return null;
     },
 
     setPriority:function (priority, delegate) {
@@ -468,8 +469,7 @@ cc.MouseDispatcher = cc.Class.extend({
                     if (mouseObj.getButton() == cc.MOUSE_RIGHTBUTTON) {
                         if (handler.getDelegate().onRightMouseDown)
                             handler.getDelegate().onRightMouseDown(mouseObj);
-                    }
-                    else {
+                    } else {
 	                   if (handler.getDelegate().onMouseDown)
 	                       handler.getDelegate().onMouseDown(mouseObj);
                      }
@@ -478,8 +478,7 @@ cc.MouseDispatcher = cc.Class.extend({
                     if (mouseObj.getButton() == cc.MOUSE_RIGHTBUTTON) {
                         if (handler.getDelegate().onRightMouseUp)
                             handler.getDelegate().onRightMouseUp(mouseObj);
-                    }
-                    else {
+                    } else {
                         if (handler.getDelegate().onMouseUp)
                             handler.getDelegate().onMouseUp(mouseObj);
                     }

cocos2d/touch_dispatcher/CCTouchDispatcher.js

@@ -363,7 +363,7 @@ cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */ {
                                 if (cc.Browser.isMobile) {
                                     if (handler.getDelegate().onTouchMoved) handler.getDelegate().onTouchMoved(touch, event);
                                 } else {
-                                    if (this._mousePressed) if (handler.getDelegate().onTouchMoved) handler.getDelegate().onTouchMoved(touch, event);
+                                    if (this._mousePressed && handler.getDelegate().onTouchMoved) handler.getDelegate().onTouchMoved(touch, event);
                                 }
                                 break;
                             case cc.TOUCH_ENDED:
@@ -411,7 +411,7 @@ cc.TouchDispatcher = cc.Class.extend(/** @lends cc.TouchDispatcher# */ {
                             if (cc.Browser.isMobile) {
                                 if (handler.getDelegate().onTouchesMoved) handler.getDelegate().onTouchesMoved(mutableTouches, event);
                             } else {
-                                if (this._mousePressed) if (handler.getDelegate().onTouchesMoved) handler.getDelegate().onTouchesMoved(mutableTouches, event);
+                                if (this._mousePressed && handler.getDelegate().onTouchesMoved) handler.getDelegate().onTouchesMoved(mutableTouches, event);
                             }
                         }
                         break;