jenkins-bot has submitted this change and it was merged.
Change subject: Cope with derived method call from base constructor
......................................................................
Cope with derived method call from base constructor
In ve.ce.ContentBranchNode's constructor, set this.rendered before the call
to the parent constructor (i.e. ve.ce.BranchNode's), because that calls
ve.ce.ContentBranchNode#renderContents .
TODO: Work out how we should be doing this in general.
Change-Id: I90ed05c4134a029c4743ab25cc1abfbb44074938
---
M src/ce/ve.ce.ContentBranchNode.js
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.ContentBranchNode.js
b/src/ce/ve.ce.ContentBranchNode.js
index 45a93e8..b8220b8 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -16,14 +16,16 @@
* @param {Object} [config] Configuration options
*/
ve.ce.ContentBranchNode = function VeCeContentBranchNode( model, config ) {
+ // Properties
+ this.lastTransaction = null;
+ // Parent constructor calls renderContents, so this must be set first
+ this.rendered = this.rendered;
+ this.unicornAnnotations = null;
+ this.unicorns = null;
+
// Parent constructor
ve.ce.BranchNode.call( this, model, config );
- // Properties
- this.lastTransaction = null;
- this.rendered = false;
- this.unicornAnnotations = null;
- this.unicorns = null;
this.onClickHandler = this.onClick.bind( this );
// Events
@@ -358,6 +360,7 @@
// However we have to normalize to cope with consecutive text nodes. We
can't normalize
// the attached version, because that would close IMEs. As an
optimization, don't perform
// this checking if this node has never rendered before.
+
if ( this.rendered ) {
oldWrapper = this.$element[0].cloneNode( true );
newWrapper = this.$element[0].cloneNode( false );
--
To view, visit https://gerrit.wikimedia.org/r/221884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90ed05c4134a029c4743ab25cc1abfbb44074938
Gerrit-PatchSet: 7
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Divec <da...@troi.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
