Pastakhov has uploaded a new change for review. https://gerrit.wikimedia.org/r/230484
Change subject: add highlighting of table caption (v 3.1.6) ...................................................................... add highlighting of table caption (v 3.1.6) Bug: T108452 Change-Id: I543db4c26c1a0ed7314ae826ddd2876de7539bf2 --- M CodeMirror.php M resources/mode/mediawiki/mediawiki.css M resources/mode/mediawiki/mediawiki.js 3 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/84/230484/1 diff --git a/CodeMirror.php b/CodeMirror.php index 3c54e6c..b8f05bd 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.5'; +const EXT_CODEMIRROR_VERSION = '3.1.6'; // Register this extension on Special:Version $wgExtensionCredits['parserhook'][] = array( diff --git a/resources/mode/mediawiki/mediawiki.css b/resources/mode/mediawiki/mediawiki.css index 3a8414d..4e09db8 100644 --- a/resources/mode/mediawiki/mediawiki.css +++ b/resources/mode/mediawiki/mediawiki.css @@ -73,6 +73,7 @@ .cm-mw-table-bracket {color: #e0e; font-weight: bold;} .cm-mw-table-delimiter {color: #e0e; font-weight: bold;} .cm-mw-table-definition {color: #e0e; font-weight: normal;} +.cm-mw-table-caption {font-weight: bold;} .cm-mw-template-ground {} .cm-mw-template2-ground {background-image: url(img/template4.png);} diff --git a/resources/mode/mediawiki/mediawiki.js b/resources/mode/mediawiki/mediawiki.js index e0ed4b1..ac12a3e 100644 --- a/resources/mode/mediawiki/mediawiki.js +++ b/resources/mode/mediawiki/mediawiki.js @@ -510,6 +510,19 @@ return eatWikiText( 'mw-table-definition', '' )( stream, state ); } + function inTableCaption( stream, state ) { + if ( stream.sol() ) { + var peek = stream.peek(); + if ( peek === '|' || peek === '!' ) { + state.tokenize = inTable; + return state.tokenize( stream, state ); + } + state.isBold = false; + state.isItalic = false; + } + return eatWikiText( 'mw-table-caption', '' )( stream, state ); + } + function inTable( stream, state ) { if ( stream.sol() ) { if ( stream.eat( '|' ) ) { @@ -518,6 +531,11 @@ state.tokenize = inTableDefinition; return makeLocalStyle( 'mw-table-delimiter', state ); } + if ( stream.eat( '+' ) ) { + stream.eatSpace(); + state.tokenize = inTableCaption; + return makeLocalStyle( 'mw-table-delimiter', state ); + } if ( stream.eat( '}' ) ) { state.tokenize = state.stack.pop(); return makeLocalStyle( 'mw-table-bracket', state ); -- To view, visit https://gerrit.wikimedia.org/r/230484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I543db4c26c1a0ed7314ae826ddd2876de7539bf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Pastakhov <pastak...@yandex.ru> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits