jenkins-bot has submitted this change and it was merged.
Change subject: Use ve.dm.MWInternalLinkAnnotation for autolinks where
appropriate
......................................................................
Use ve.dm.MWInternalLinkAnnotation for autolinks where appropriate
Change-Id: I904e797732c98a07654772a4f2432ba3ae5d7050
---
M modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
index ad2badd..5bf915f 100644
--- a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
+++ b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
@@ -54,10 +54,20 @@
* @return {ve.dm.MWExternalLinkAnnotation} The annotation to use.
*/
ve.ui.MWLinkAction.prototype.getLinkAnnotation = function ( href ) {
- return new ve.dm.MWExternalLinkAnnotation( {
- type: 'link/mwExternal',
- attributes: { href: href }
- } );
+ var title,
+ targetData =
ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
+ href,
+ this.surface.getModel().getDocument().getHtmlDocument()
+ );
+ if ( targetData.isInternal ) {
+ title = mw.Title.newFromText( targetData.title );
+ }
+ return title ?
+ ve.dm.MWInternalLinkAnnotation.static.newFromTitle( title ) :
+ new ve.dm.MWExternalLinkAnnotation( {
+ type: 'link/mwExternal',
+ attributes: { href: href }
+ } );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/231167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I904e797732c98a07654772a4f2432ba3ae5d7050
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
