jenkins-bot has submitted this change and it was merged.
Change subject: MWLinkAnnotationInspector: Get HtmlDocument in a different way
......................................................................
MWLinkAnnotationInspector: Get HtmlDocument in a different way
Get the HtmlDocument in a different way that doesn't involve
ve.init.target.
For page (non-Flow) MW VE, I checked that it yields the same result.
Bug: T103176
Change-Id: I54bdf4f29f6acf4359be45b5b2ddfd23b5835c34
---
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Mattflaschen: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
index 3a6195a..6d7a271 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
@@ -85,14 +85,15 @@
*/
ve.ui.MWLinkAnnotationInspector.prototype.onInternalLinkChange = function (
annotation ) {
var title,
- href = annotation ? annotation.getAttribute( 'title' ) : '';
+ href = annotation ? annotation.getAttribute( 'title' ) : '',
+ htmlDoc = this.getFragment().getDocument().getHtmlDocument();
- if ( ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( href )
) {
+ if ( htmlDoc &&
ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( href ) ) {
// Check if the 'external' link is in fact a page on the same
wiki
// e.g. http://en.wikipedia.org/wiki/Target -> Target
title =
ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
href,
- ve.init.target.doc
+ htmlDoc
).title;
if ( title !== href ) {
this.internalAnnotationInput.text.setValue( title );
--
To view, visit https://gerrit.wikimedia.org/r/220378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54bdf4f29f6acf4359be45b5b2ddfd23b5835c34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
