wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-27 15:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix js code for passing jshint (v 1.1.1)

Browse source 
Bug: 69869
Change-Id: I1b058ea1dc6c5c3e10ff2de39f03ddd72207e57e
This commit is contained in:
Pavel Astakhov 2014-08-22 10:18:51 +06:00
parent 1a05b6c9d2
commit bdb653d94e
4 changed files with 81 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.jshintignore Normal file
View file

@ -0,0 +1,2 @@
# upstream libs
resources/lib/

2
CodeMirror.php
View file

@ -15,7 +15,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
die( 'This file is an extension to MediaWiki and thus not a valid entry point.' );
}
const CODEMIRROR_VERSION = '1.1.0';
const CODEMIRROR_VERSION = '1.1.1';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(

23
resources/ext.CodeMirror.js
View file

@ -1,12 +1,13 @@
$( document ).ready( function () {
var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("wpTextbox1"), {
styleActiveLine: true,
//lineNumbers: true,
lineWrapping: true,
//indentUnit: 4,
//indentWithTabs: true
//matchBrackets: true,
//autoCloseBrackets: true,
mode: "text/mediawiki"
});
/*global CodeMirror*/
jQuery( document ).ready( function ( $ ) {
CodeMirror.fromTextArea( $( '#wpTextbox1' )[0], {
styleActiveLine: true,
//lineNumbers: true,
lineWrapping: true,
//indentUnit: 4,
//indentWithTabs: true
//matchBrackets: true,
//autoCloseBrackets: true,
mode: 'text/mediawiki'
} );
} );

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

@ -1,138 +1,137 @@
// CodeMirror, copyright (c) by Marijn Haverbeke and others
// Distributed under an MIT license: http://codemirror.net/LICENSE
/*global CodeMirror, define, require */
(function( mod ) {
if ( typeof exports === 'object' && typeof module === 'object' ) { // CommonJS
mod( require( '../../lib/codemirror' ), require( '../htmlmixed/htmlmixed' ) );
} else if ( typeof define === 'function' && define.amd ) { // AMD
define( ['../../lib/codemirror', '../htmlmixed/htmlmixed'], mod );
} else { // Plain browser env
mod( CodeMirror );
}
})(function( CodeMirror ) {
'use strict';
(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
else if (typeof define == "function" && define.amd) // AMD
define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("mediawiki", function(config, parserConfig) {
function inTemplatePageName(stream, state) { // {{
if (stream.eat("#")) {
CodeMirror.defineMode('mediawiki', function( /*config, parserConfig*/ ) {
function inTemplatePageName( stream, state ) { // {{
if ( stream.eat( '#' ) ) {
state.tokenize = inParserFunctionName;
return "strong";
return 'strong';
}
stream.eatWhile(/[^\|\}\s]/);
stream.eatWhile( /[^\|\}\s]/ );
state.tokenize = inTemplateArgumentSeparator;
return "link";
return 'link';
}
function inTemplateArgumentSeparator(stream, state) { // {{ Page name |
if (stream.eatSpace() && !stream.eol()) {
function inTemplateArgumentSeparator( stream, state ) { // {{ Page name |
if ( stream.eatSpace() && !stream.eol() ) {
var peek = stream.peek();
if ( peek !== "|" && peek != "}" ) {
if ( peek !== '|' && peek !== '}' ) {
state.tokenize = inTemplatePageName;
return "link";
return 'link';
}
}
if (stream.eat("|")) {
if ( stream.eat( '|' ) ) {
state.tokenize = inTemplateArgument;
return "tag strong";
return 'tag strong';
}
if (stream.eat("}")) {
if (stream.eat("}")) {
if ( stream.eat( '}' ) ) {
if ( stream.eat( '}' ) ) {
state.tokenize = inWikitext;
return "tag bracket";
return 'tag bracket';
}
}
if ( stream.eol() ) {
return null;
}
stream.next();
return "error";
return 'error';
}
function inTemplateArgument(stream, state) { // {{ Page name |
stream.eatWhile(/[^\|}]/);
function inTemplateArgument( stream, state ) { // {{ Page name |
stream.eatWhile( /[^\|}]/ );
state.tokenize = inTemplateArgumentSeparator;
return "string";
return 'string';
}
function inParserFunctionName(stream, state) { // {{#
if (stream.eatWhile(/\w/)) {
if (stream.peek() === ":") {
function inParserFunctionName( stream, state ) { // {{#
if ( stream.eatWhile( /\w/ ) ) {
if ( stream.peek() === ':' ) {
state.tokenize = inParserFunctionArgumentSeparator;
return "keyword strong";
return 'keyword strong';
}
}
state.tokenize = inWikitext;
return "error";
return 'error';
}
function inParserFunctionArgumentSeparator(stream, state) { // {{ Page name |
if (stream.eat(/[|:]/)) {
function inParserFunctionArgumentSeparator( stream, state ) { // {{ Page name |
if ( stream.eat( /[|:]/ ) ) {
state.tokenize = inParserFunctionArgument;
return "tag strong";
return 'tag strong';
}
if (stream.eat("}")) {
if (stream.eat("}")) {
if ( stream.eat( '}' ) ) {
if ( stream.eat( '}' ) ) {
state.tokenize = inWikitext;
return "tag bracket";
return 'tag bracket';
}
}
stream.next();
return "string";
return 'string';
}
function inParserFunctionArgument(stream, state) { // {{#
stream.eatWhile(/[^|}]/);
function inParserFunctionArgument( stream, state ) { // {{#
stream.eatWhile( /[^|}]/ );
state.tokenize = inParserFunctionArgumentSeparator;
return "string";
return 'string';
}
function inWikitext(stream, state) {
function inWikitext( stream, state ) {
var style = [];
var sol = stream.sol();
var ch = stream.next();
if (sol) {
if ( sol ) {
state.isBold = false;
state.isItalic = false;
}
switch (ch) {
case "{":
if (stream.eat("{")) { // Templates
switch ( ch ) {
case '{':
if ( stream.eat( '{' ) ) { // Templates
state.tokenize = inTemplatePageName;
stream.eatSpace();
return "tag bracket";
return 'tag bracket';
}
break;
case "'":
if (stream.match("''")) {
state.isBold = (state.isBold ? false : true);
} else if (stream.match("'")) {
state.isItalic = (state.isItalic ? false : true);
case '\'':
if ( stream.match( '\'\'' ) ) {
state.isBold = ( state.isBold ? false : true );
} else if ( stream.match( '\'' ) ) {
state.isItalic = ( state.isItalic ? false : true );
}
break;
}
if (state.isBold) {
style.push("strong");
if ( state.isBold ) {
style.push( 'strong' );
}
if (state.isItalic) {
style.push("em");
if ( state.isItalic ) {
style.push( 'em' );
}
if (style.length > 0) {
return style.join(" ");
if ( style.length > 0 ) {
return style.join(' ');
}
return null;
}
return {
startState: function() {
return {tokenize: inWikitext, style: null};
return { tokenize: inWikitext, style: null };
},
token: function(stream, state) {
return state.tokenize(stream, state);
token: function( stream, state ) {
return state.tokenize( stream, state );
}
};
});
CodeMirror.defineMIME("text/mediawiki", "mediawiki");
CodeMirror.defineMIME( 'text/mediawiki', 'mediawiki' );
});