Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295345
Change subject: Fix ve.BranchNode#traverse and make non-static
......................................................................
Fix ve.BranchNode#traverse and make non-static
Previously made reference to ve.ce.BranchNode and
was unnecessarily static.
Change-Id: Ic0b3fdff1325672314d3bf579ab25d99dfe8c511
---
M src/ui/elements/ve.ui.PreviewElement.js
M src/ve.BranchNode.js
2 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/45/295345/1
diff --git a/src/ui/elements/ve.ui.PreviewElement.js
b/src/ui/elements/ve.ui.PreviewElement.js
index 7c974e6..460b84a 100644
--- a/src/ui/elements/ve.ui.PreviewElement.js
+++ b/src/ui/elements/ve.ui.PreviewElement.js
@@ -110,7 +110,7 @@
// Traverse children to see when they are all rerendered
if ( this.view instanceof ve.ce.BranchNode ) {
- ve.BranchNode.static.traverse( this.view, queueNode );
+ this.view.traverse( queueNode );
} else {
queueNode( this.view );
}
diff --git a/src/ve.BranchNode.js b/src/ve.BranchNode.js
index 3172424..23719a7 100644
--- a/src/ve.BranchNode.js
+++ b/src/ve.BranchNode.js
@@ -26,7 +26,7 @@
OO.initClass( ve.BranchNode );
-/* Static Methods */
+/* Methods */
/**
* Traverse a branch node depth-first.
@@ -35,19 +35,17 @@
* @param {Function} callback Callback to execute for each traversed node
* @param {ve.Node} callback.node Node being traversed
*/
-ve.BranchNode.static.traverse = function ( node, callback ) {
+ve.BranchNode.prototype.traverse = function ( node, callback ) {
var i, len,
children = node.getChildren();
for ( i = 0, len = children.length; i < len; i++ ) {
callback.call( this, children[ i ] );
- if ( children[ i ] instanceof ve.ce.BranchNode ) {
- this.traverse( children[ i ], callback );
+ if ( children[ i ].hasChildren() ) {
+ children[ i ].traverse( callback );
}
}
};
-
-/* Methods */
/**
* Check if the node has children.
--
To view, visit https://gerrit.wikimedia.org/r/295345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0b3fdff1325672314d3bf579ab25d99dfe8c511
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
