jenkins-bot has submitted this change and it was merged.
Change subject: ReferenceContextItem: Factor out getReferenceNode and use
correct node
......................................................................
ReferenceContextItem: Factor out getReferenceNode and use correct node
Use the node from the parent dm document, not the internal list document.
Change-Id: Ieeb0a63bd40de7a8a2944322ba800feec7a7f4dd
---
M modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
1 file changed, 20 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
index 2295a1a..635b411 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
@@ -48,12 +48,9 @@
* @return {jQuery} DOM rendering of reference
*/
ve.ui.MWReferenceContextItem.prototype.getRendering = function () {
- var refModel;
- if ( this.model.isEditable() ) {
- refModel = ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.model );
- this.view = new ve.ui.PreviewElement(
- refModel.getDocument().getInternalList().getItemNode(
refModel.getListIndex() )
- );
+ var refNode = this.getReferenceNode();
+ if ( refNode ) {
+ this.view = new ve.ui.PreviewElement( refNode );
// The $element property may be rendered into asynchronously,
update the context's size when the
// rendering is complete if that's the case
@@ -68,6 +65,23 @@
};
/**
+ * Get the reference node in the containing document (not the internal list
document)
+ *
+ * @return {ve.dm.Node} Reference node
+ */
+ve.ui.MWReferenceContextItem.prototype.getReferenceNode = function () {
+ var refModel;
+ if ( !this.model.isEditable() ) {
+ return null;
+ }
+ if ( !this.referenceNode ) {
+ refModel = ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.model );
+ this.referenceNode =
this.getFragment().getDocument().getInternalList().getItemNode(
refModel.getListIndex() );
+ }
+ return this.referenceNode;
+};
+
+/**
* @inheritdoc
*/
ve.ui.MWReferenceContextItem.prototype.getDescription = function () {
--
To view, visit https://gerrit.wikimedia.org/r/243669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeb0a63bd40de7a8a2944322ba800feec7a7f4dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
