Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230579
Change subject: fix function eatFreeExternalLink (v 3.1.10)
......................................................................
fix function eatFreeExternalLink (v 3.1.10)
allow one '{' in free external link
Change-Id: Ieaa157b79cff9d05d8bed3ae536cfe45e7e4ae42
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/79/230579/1
diff --git a/CodeMirror.php b/CodeMirror.php
index 9590c3d..9174f07 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-const EXT_CODEMIRROR_VERSION = '3.1.9';
+const EXT_CODEMIRROR_VERSION = '3.1.10';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js
b/resources/mode/mediawiki/mediawiki.js
index b22cdd6..6680168 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -597,14 +597,16 @@
// @todo error message
} else if ( stream.match( /[^\s\u00a0\{\[\]<>~\)\.,]*/ ) ) {
if ( stream.peek() === '~' ) {
- if ( stream.match( /~{3,}/, false ) ) {
- state.tokenize = state.stack.pop();
- return makeLocalStyle(
'mw-free-extlink', state );
- } else {
+ if ( !stream.match( /~{3,}/, false ) ) {
stream.match( /~*/ );
return makeLocalStyle(
'mw-free-extlink', state );
}
- } else if ( stream.match(
/[\)\.,]*(?=[^\s\u00a0\{\[\]<>~\)\.,])/ ) ) {
+ } else if ( stream.peek() === '{' ) {
+ if ( !stream.match( /\{\{/, false ) ) {
+ stream.eat( '{' );
+ return makeLocalStyle(
'mw-free-extlink', state );
+ }
+ } else if ( stream.match(
/[\)\.,]+(?=[^\s\u00a0\{\[\]<>~\)\.,])/ ) ) {
return makeLocalStyle( 'mw-free-extlink', state
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/230579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa157b79cff9d05d8bed3ae536cfe45e7e4ae42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
