wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-09-24 10:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't match // as protocol unless used in a link"

Browse source
This commit is contained in:
jenkins-bot 2018-03-15 23:51:21 +00:00 committed by Gerrit Code Review
parent ccbce0e69d 5c8eb20c33
commit 0e4bb8feb6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/mode/mediawiki/mediawiki.js
View file

@ -643,7 +643,7 @@
}
if ( sol ) {
if ( stream.match( urlProtocols ) ) { // highlight free external links, bug T108448
if ( !stream.match( '//', false ) && stream.match( urlProtocols ) ) { // highlight free external links, bug T108448
state.stack.push( state.tokenize );
state.tokenize = eatFreeExternalLink;
return makeLocalStyle( 'mw-free-extlink-protocol', state );
@ -841,7 +841,7 @@
default:
if ( /[\s\u00a0]/.test( ch ) ) {
stream.eatSpace();
if ( stream.match( urlProtocols, false ) ) { // highlight free external links, bug T108448
if ( stream.match( urlProtocols, false ) && !stream.match( '//' ) ) { // highlight free external links, bug T108448
state.stack.push( state.tokenize );
state.tokenize = eatFreeExternalLinkProtocol;
return makeStyle( style, state );