Commit 33bd6dda authored by hy's avatar hy

修复当节点>200, layout不使用动画时, layoutfinishall变为同步逻辑, 外部minder.on事件被提前录入导致BUG的问题

parent f436334f
...@@ -408,9 +408,9 @@ define(function(require, exports, module) { ...@@ -408,9 +408,9 @@ define(function(require, exports, module) {
} }
var layout = node.getLayoutInstance(); var layout = node.getLayoutInstance();
var childrenInFlow = node.getChildren().filter(function(child) { // var childrenInFlow = node.getChildren().filter(function(child) {
return !child.hasLayoutOffset(); // return !child.hasLayoutOffset();
}); // });
layout.doLayout(node, node.getChildren(), round); layout.doLayout(node, node.getChildren(), round);
} }
...@@ -422,7 +422,14 @@ define(function(require, exports, module) { ...@@ -422,7 +422,14 @@ define(function(require, exports, module) {
var minder = this; var minder = this;
this.applyLayoutResult(this.getRoot(), duration, function() { this.applyLayoutResult(this.getRoot(), duration, function() {
minder.fire('layoutallfinish'); /**
* 当节点>200, 不使用动画时, 此处逻辑变为同步逻辑, 外部minder.on事件无法
* 被提前录入, 因此增加setTimeout
* @author Naixor
*/
setTimeout(function () {
minder.fire('layoutallfinish');
}, 0);
}); });
return this.fire('layout'); return this.fire('layout');
...@@ -513,4 +520,4 @@ define(function(require, exports, module) { ...@@ -513,4 +520,4 @@ define(function(require, exports, module) {
}); });
module.exports = Layout; module.exports = Layout;
}); });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment