diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 7264eb18cb..ffe8b68f8f 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -213,10 +213,11 @@ function refreshScene () { else { var i, node, nodes = widgetManager._nodesWithWidget, len = nodes.length; if (CC_EDITOR && window._Scene && _Scene.AnimUtils && _Scene.AnimUtils.curAnimState) { + var editingNode = _Scene.AnimUtils.curRootNode; for (i = len - 1; i >= 0; i--) { node = nodes[i]; var widget = node._widget; - if (widget.isAlignOnce && animationState.animatedSinceLastFrame) { + if (widget.isAlignOnce && animationState.animatedSinceLastFrame && node.isChildOf(editingNode)) { // widget contains in _nodesWithWidget should aligned at least once widget.enabled = false; } diff --git a/jsb/jsb-action.js b/jsb/jsb-action.js index c89043a22c..f48501f545 100644 --- a/jsb/jsb-action.js +++ b/jsb/jsb-action.js @@ -359,7 +359,8 @@ var actionUpdate = { 'FadeOut': syncOpacityUpdate, 'FadeTo': syncOpacityUpdate, 'TintTo': syncColorUpdate, - 'TintBy': syncColorUpdate + 'TintBy': syncColorUpdate, + 'BezierBy': syncPositionUpdate }; for (var key in actionUpdate) {