Merge branch 'v1.1' into v1.2

# Conflicts:
#	cocos2d/core/base-ui/CCWidgetManager.js
This commit is contained in:
Jare Guo
2016-08-16 14:12:36 +08:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -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;
}
+2 -1
View File
@@ -359,7 +359,8 @@ var actionUpdate = {
'FadeOut': syncOpacityUpdate,
'FadeTo': syncOpacityUpdate,
'TintTo': syncColorUpdate,
'TintBy': syncColorUpdate
'TintBy': syncColorUpdate,
'BezierBy': syncPositionUpdate
};
for (var key in actionUpdate) {