Merge pull request cocos2d#552 from dingpinglv/iss1346_PortActions

fixed cocos2d#1346 modify code for Animate and fix bug for cc.Rect

Author: SeanLin

cocos2d/actions/CCActionInterval.js

@@ -1941,7 +1941,7 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{
     },
 
     /**
-     * @param {cc.Node} target
+     * @param {cc.Sprite} target
      */
     startWithTarget:function (target) {
         //this._super(target);
@@ -1975,20 +1975,15 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{
 
         var frames = this._animation.getFrames();
         var numberOfFrames = frames.length;
-        var frameToDisplay = null;
 
         for (var i = this._nextFrame; i < numberOfFrames; i++) {
-            var splitTime = this._splitTimes[i];
+            if (this._splitTimes[i] <= time) {
+                this._target.setDisplayFrame(frames[i].getSpriteFrame());
 
-            if (splitTime <= time) {
-                var frame = frames[i];
-                frameToDisplay = frame.getSpriteFrame();
-                this._target.setDisplayFrame(frameToDisplay);
-
-                var dict = frame.getUserInfo();
-                if (dict) {
+                //var dict = frame.getUserInfo();
+                //if (dict) {
                     //TODO: [[NSNotificationCenter defaultCenter] postNotificationName:CCAnimationFrameDisplayedNotification object:target_ userInfo:dict];
-                }
+                //}
                 this._nextFrame = i + 1;
                 break;
             }

cocos2d/cocoa/CCGeometry.js

@@ -171,7 +171,7 @@ cc.Rect.CCRectGetMaxX = function (rect) {
  * Constructor
  */
 cc.Rect.CCRectGetMidX = function (rect) {
-    return ((rect.origin.x + rect.size.width) / 2.0);
+    return (rect.origin.x + rect.size.width / 2.0);
 };
 /**
  * return the leftmost x-value of 'rect'