Merge pull request cocos2d#2481 from pandamicro/develop

cocos2d-js#1161: Fix MenuItemSprite's automatic init logic

Author: dingpinglv

cocos2d/menus/CCMenu.js

@@ -466,6 +466,7 @@ cc.Menu = cc.Layer.extend(/** @lends cc.Menu# */{
         if (target._selectedItem) {
             target._state = cc.MENU_STATE_TRACKING_TOUCH;
             target._selectedItem.selected();
+            target._selectedItem.setNodeDirty();
             return true;
         }
         return false;
@@ -480,6 +481,7 @@ cc.Menu = cc.Layer.extend(/** @lends cc.Menu# */{
         if (target._selectedItem) {
             target._selectedItem.unselected();
             target._selectedItem.activate();
+            target._selectedItem.setNodeDirty();
         }
         target._state = cc.MENU_STATE_WAITING;
     },
@@ -490,8 +492,10 @@ cc.Menu = cc.Layer.extend(/** @lends cc.Menu# */{
             cc.log("cc.Menu.onTouchCancelled(): invalid state");
             return;
         }
-        if (this._selectedItem)
+        if (this._selectedItem) {
             target._selectedItem.unselected();
+            target._selectedItem.setNodeDirty();
+        }
         target._state = cc.MENU_STATE_WAITING;
     },
 
@@ -503,11 +507,15 @@ cc.Menu = cc.Layer.extend(/** @lends cc.Menu# */{
         }
         var currentItem = target._itemForTouch(touch);
         if (currentItem != target._selectedItem) {
-            if (target._selectedItem)
+            if (target._selectedItem) {
                 target._selectedItem.unselected();
+                target._selectedItem.setNodeDirty();
+            }
             target._selectedItem = currentItem;
-            if (target._selectedItem)
+            if (target._selectedItem) {
                 target._selectedItem.selected();
+                target._selectedItem.setNodeDirty();
+            }
         }
     },
 

cocos2d/menus/CCMenuItem.js

@@ -740,9 +740,9 @@ cc.MenuItemSprite = cc.MenuItem.extend(/** @lends cc.MenuItemSprite# */{
             } else if (four !== undefined && cc.isFunction(three)) {
                 target = four;
                 callback = three;
-                disabledImage = new cc.Sprite(selectedSprite);
+                disabledImage = new cc.Sprite(selectedSprite.getTexture(), selectedSprite.getTextureRect());
             } else if (three === undefined) {
-                disabledImage = new cc.Sprite(selectedSprite);
+                disabledImage = new cc.Sprite(selectedSprite.getTexture(), selectedSprite.getTextureRect());
             }
             this.initWithNormalSprite(normalSprite, selectedSprite, disabledImage, callback, target);
         }