Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303327

Change subject: Take link fragments into account
......................................................................

Take link fragments into account

TODO: Do we need to do anything special here to handle multiple hash symbols in 
a URL?

Bug: T112898
Change-Id: I4773cb04ae2533e8125bc55d9ebb606d63b3bf48
---
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/27/303327/1

diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js 
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 65d3c26..abc51b1 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -66,6 +66,9 @@
                // rather than an image inclusion or categorization
                target = ':' + target;
        }
+       if ( title.getFragment() ) {
+               target += '#' + title.getFragment();
+       }
 
        return new ve.dm.MWInternalLinkAnnotation( {
                type: 'link/mwInternal',
@@ -147,7 +150,13 @@
                }
        } else {
                // Don't escape slashes in the title; they represent subpages.
-               href = title.split( '/' ).map( encodeURIComponent ).join( '/' );
+               href = title.split( /(\/|#)/ ).map( function ( part ) {
+                       if ( part === '/' || part === '#' ) {
+                               return part;
+                       } else {
+                               return encodeURIComponent( part );
+                       }
+               } ).join( '' );
        }
        return href;
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4773cb04ae2533e8125bc55d9ebb606d63b3bf48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <a...@wikimedia.org>

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

Reply via email to