jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/365057 )

Change subject: ce.MWTransclusionNode: make sure model exists before getting 
its document
......................................................................


ce.MWTransclusionNode: make sure model exists before getting its document

Bug: T168932
Change-Id: Idf18839b1f1fae6eb29621f1950d2b52c99e3433
---
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 5a37a5f..518601c 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -155,7 +155,7 @@
        }
 
        // Work around https://github.com/jquery/jquery/issues/1997
-       contentNodes = $.parseHTML( response.visualeditor.content, 
this.getModelHtmlDocument() ) || [];
+       contentNodes = $.parseHTML( response.visualeditor.content, this.model 
&& this.getModelHtmlDocument() ) || [];
        deferred.resolve( this.constructor.static.filterRendering( contentNodes 
) );
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/365057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf18839b1f1fae6eb29621f1950d2b52c99e3433
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to