From dc6ceeecf40c187a1a342b7f17e066c63737c86d Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Mon, 18 Jul 2016 21:23:55 +0800 Subject: [PATCH 1/2] should not disable widget if it is not a child of current editing animation --- cocos2d/core/base-ui/CCWidgetManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 5ea2b125b7..f216a1b251 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -183,11 +183,12 @@ function refreshScene () { } else { var i, node, nodes = widgetManager._nodesWithWidget, len = nodes.length; if (CC_EDITOR && _Scene.AnimUtils.curAnimState) { + var editingNode = _Scene.AnimUtils.curRootNode; // always check isAlignOnce because animation mode maybe changed for (i = len - 1; i >= 0; i--) { node = nodes[i]; var widget = node._widget; - if (widget.isAlignOnce) { + if (widget.isAlignOnce && node.isChildOf(editingNode)) { // widget contains in _nodesWithWidget should aligned at least once widget.enabled = false; } From ae8f7abebf9f58965a587bf171c94ee4a1d6350e Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 20 Jul 2016 11:10:09 +0800 Subject: [PATCH 2/2] fix Bezier node's coordinates when no sync bug for #fireball/issues/3660 --- jsb/jsb-action.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsb/jsb-action.js b/jsb/jsb-action.js index f2f0659f6f..46cc8761d8 100644 --- a/jsb/jsb-action.js +++ b/jsb/jsb-action.js @@ -332,7 +332,8 @@ var actionUpdate = { 'FadeOut': syncOpacityUpdate, 'FadeTo': syncOpacityUpdate, 'TintTo': syncColorUpdate, - 'TintBy': syncColorUpdate + 'TintBy': syncColorUpdate, + 'BezierBy': syncPositionUpdate }; for (var key in actionUpdate) {