Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60848
Change subject: Remove unused variables.
......................................................................
Remove unused variables.
'jshint --show-non-errors' shows unused variables. Some of these are unused
function arguments, which are rarely bugs. But try to fix the ones which
are forgotten/dead code and unnecessary require()s.
Change-Id: I685ccd8e388fd3acf75053a07e2f729398fa2855
---
M js/api/ParserService.js
M js/lib/ext.Cite.js
M js/lib/ext.core.AttributeExpander.js
M js/lib/ext.core.BehaviorSwitchHandler.js
M js/lib/ext.core.ExtensionHandler.js
M js/lib/ext.core.LinkHandler.js
M js/lib/ext.core.ListHandler.js
M js/lib/ext.core.NoIncludeOnly.js
M js/lib/ext.core.ParagraphWrapper.js
M js/lib/ext.core.ParserFunctions.js
M js/lib/ext.core.PreHandler.js
M js/lib/ext.core.QuoteTransformer.js
M js/lib/ext.core.Sanitizer.js
M js/lib/ext.core.TemplateHandler.js
M js/lib/ext.core.TokenStreamPatcher.js
M js/lib/ext.util.TokenCollector.js
M js/lib/fakejquery.js
M js/lib/mediawiki.ApiRequest.js
M js/lib/mediawiki.DOMDiff.js
M js/lib/mediawiki.DOMPostProcessor.js
M js/lib/mediawiki.HTML5TreeBuilder.node.js
M js/lib/mediawiki.SelectiveSerializer.js
M js/lib/mediawiki.TokenTransformManager.js
M js/lib/mediawiki.Util.js
M js/lib/mediawiki.WikiConfig.js
M js/lib/mediawiki.WikitextSerializer.js
M js/lib/mediawiki.parser.environment.js
M js/lib/mediawiki.parser.js
M js/lib/mediawiki.tokenizer.peg.js
M js/tests/dumpReader.js
M js/tests/mockAPI.js
M js/tests/parse.js
M js/tests/parserTests.js
M js/tests/roundtrip-test.js
M js/tests/server/server.js
35 files changed, 48 insertions(+), 171 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/48/60848/1
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index 1b75ff7..8ed1902 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -17,19 +17,11 @@
* @private
*/
-/**
- * Configuration object.
- * @property
- */
-var config = {};
-
// global includes
var express = require('express'),
jsDiff = require('diff'),
childProc = require('child_process'),
spawn = childProc.spawn,
- fork = childProc.fork,
- path = require('path'),
cluster = require('cluster'),
fs = require('fs');
@@ -60,9 +52,6 @@
SelectiveSerializer = require( mp + 'mediawiki.SelectiveSerializer.js'
).SelectiveSerializer,
Util = require( mp + 'mediawiki.Util.js' ).Util,
libtr = require(mp + 'mediawiki.ApiRequest.js'),
- DoesNotExistError = libtr.DoesNotExistError,
- ParserError = libtr.ParserError,
- WikiConfig = require( mp + 'mediawiki.WikiConfig' ).WikiConfig,
ParsoidConfig = require( mp + 'mediawiki.ParsoidConfig' ).ParsoidConfig,
MWParserEnvironment = require( mp + 'mediawiki.parser.environment.js'
).MWParserEnvironment,
TemplateRequest = libtr.TemplateRequest;
diff --git a/js/lib/ext.Cite.js b/js/lib/ext.Cite.js
index 174cf41..d766587 100644
--- a/js/lib/ext.Cite.js
+++ b/js/lib/ext.Cite.js
@@ -9,9 +9,7 @@
$ = require( './fakejquery' );
// define some constructor shortcuts
var KV = defines.KV,
- TagTk = defines.TagTk,
- SelfclosingTagTk = defines.SelfclosingTagTk,
- EndTagTk = defines.EndTagTk;
+ SelfclosingTagTk = defines.SelfclosingTagTk;
// FIXME: Move out to some common helper file?
// Helper function to process extension source
@@ -234,8 +232,6 @@
*/
References.prototype.handleReferences = function ( manager, pipelineOpts,
refsTok, cb ) {
refsTok = refsTok.clone();
-
- var cite = this.cite;
// group is the only recognized option?
var refsOpts = Util.KVtoHash(refsTok.getAttribute("options")),
diff --git a/js/lib/ext.core.AttributeExpander.js
b/js/lib/ext.core.AttributeExpander.js
index 15ade81..e458bfd 100644
--- a/js/lib/ext.core.AttributeExpander.js
+++ b/js/lib/ext.core.AttributeExpander.js
@@ -3,19 +3,14 @@
*/
"use strict";
-var request = require('request'),
- events = require('events'),
- qs = require('querystring'),
- Util = require('./mediawiki.Util.js').Util,
- ParserFunctions =
require('./ext.core.ParserFunctions.js').ParserFunctions,
+var Util = require('./mediawiki.Util.js').Util,
AttributeTransformManager =
require('./mediawiki.TokenTransformManager.js').
AttributeTransformManager,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
var KV = defines.KV,
TagTk = defines.TagTk,
- SelfclosingTagTk = defines.SelfclosingTagTk,
- EndTagTk = defines.EndTagTk;
+ SelfclosingTagTk = defines.SelfclosingTagTk;
/* ----------------------------------------------------------
* This helper method does two different things:
diff --git a/js/lib/ext.core.BehaviorSwitchHandler.js
b/js/lib/ext.core.BehaviorSwitchHandler.js
index 9567656..96d5644 100644
--- a/js/lib/ext.core.BehaviorSwitchHandler.js
+++ b/js/lib/ext.core.BehaviorSwitchHandler.js
@@ -4,9 +4,7 @@
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
var KV = defines.KV,
- TagTk = defines.TagTk,
- SelfclosingTagTk = defines.SelfclosingTagTk,
- EndTagTk = defines.EndTagTk;
+ SelfclosingTagTk = defines.SelfclosingTagTk;
function BehaviorSwitchHandler( manager, options ) {
this.manager = manager;
diff --git a/js/lib/ext.core.ExtensionHandler.js
b/js/lib/ext.core.ExtensionHandler.js
index 4e48986..fd70ffb 100644
--- a/js/lib/ext.core.ExtensionHandler.js
+++ b/js/lib/ext.core.ExtensionHandler.js
@@ -9,7 +9,6 @@
// define some constructor shortcuts
var KV = defines.KV,
TagTk = defines.TagTk,
- SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
function ExtensionHandler(manager, options) {
diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js
index 1458981..dd52f01 100644
--- a/js/lib/ext.core.LinkHandler.js
+++ b/js/lib/ext.core.LinkHandler.js
@@ -118,7 +118,7 @@
WikiLinkHandler.prototype.onWikiLink = function ( token, frame, cb ) {
- var j, maybeContent, about, possibleTags, property, newType,
+ var j, about, property,
hrefkv, saniContent, strContent, env = this.manager.env,
attribs = token.attribs,
hrefSrc = Util.lookupKV( token.attribs, 'href' ).vsrc,
@@ -729,7 +729,6 @@
tagAttrs,
builtTag,
href = Util.tokensToString( Util.lookup( token.attribs, 'href'
) ),
- modTxt = false,
origTxt = token.getWTSource( env ),
txt = href;
@@ -784,7 +783,7 @@
origHref = Util.lookup( token.attribs, 'href' ),
href = Util.tokensToString( origHref ),
content = Util.lookup( token.attribs, 'mw:content'),
- newAttrs, aStart, hrefKv, title;
+ newAttrs, aStart, title;
//console.warn('extlink href: ' + href );
//console.warn( 'mw:content: ' + JSON.stringify( content, null, 2 ) );
diff --git a/js/lib/ext.core.ListHandler.js b/js/lib/ext.core.ListHandler.js
index 80538f8..c6c3a27 100644
--- a/js/lib/ext.core.ListHandler.js
+++ b/js/lib/ext.core.ListHandler.js
@@ -6,10 +6,8 @@
var Util = require('./mediawiki.Util.js').Util,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- NlTk = defines.NlTk,
+var NlTk = defines.NlTk,
TagTk = defines.TagTk,
- SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
function ListHandler ( manager ) {
@@ -63,7 +61,7 @@
console.warn("T:list:any " + JSON.stringify(token));
}
- var tokens, solTokens;
+ var tokens;
if (!this.currListFrame) {
// this.currListFrame will be null only when we are in a table
// that in turn was seen in a list context.
diff --git a/js/lib/ext.core.NoIncludeOnly.js b/js/lib/ext.core.NoIncludeOnly.js
index a762bd9..e24dce7 100644
--- a/js/lib/ext.core.NoIncludeOnly.js
+++ b/js/lib/ext.core.NoIncludeOnly.js
@@ -30,8 +30,7 @@
};
var buildStrippedMetaToken = function ( manager, tokenName, startDelim,
endDelim ) {
- var tokens = [],
- da = startDelim.dataAttribs,
+ var da = startDelim.dataAttribs,
tsr0 = da ? da.tsr : null,
t0 = tsr0 ? tsr0[0] : null,
t1, tsr1;
diff --git a/js/lib/ext.core.ParagraphWrapper.js
b/js/lib/ext.core.ParagraphWrapper.js
index 93cff76..ea64689 100644
--- a/js/lib/ext.core.ParagraphWrapper.js
+++ b/js/lib/ext.core.ParagraphWrapper.js
@@ -158,7 +158,7 @@
ParagraphWrapper.prototype.processPendingNLs = function (isBlockToken) {
var resToks = this.nonNlTokens,
newLineCount = this.newLineCount,
- nlTk, nlTk2;
+ nlTk;
if (this.trace) {
console.warn(" p-wrap:NL-count: " + newLineCount);
@@ -167,7 +167,6 @@
if (newLineCount >= 2) {
while ( newLineCount >= 3 ) {
// 1. Close any open p-tag
- var hadOpenTag = this.hasOpenPTag;
this.closeOpenPTag(resToks);
var topTag = this.tableTags.length > 0 ?
this.tableTags.last(): null;
diff --git a/js/lib/ext.core.ParserFunctions.js
b/js/lib/ext.core.ParserFunctions.js
index bd9100b..7ee8931 100644
--- a/js/lib/ext.core.ParserFunctions.js
+++ b/js/lib/ext.core.ParserFunctions.js
@@ -22,7 +22,6 @@
var async = require('async');
var Util = require('./mediawiki.Util.js').Util;
-var Namespace = require( './mediawiki.Title.js' ).Namespace;
var defines = require('./mediawiki.parser.defines.js');
function ParserFunctions ( manager ) {
diff --git a/js/lib/ext.core.PreHandler.js b/js/lib/ext.core.PreHandler.js
index ee66131..d51e92c 100644
--- a/js/lib/ext.core.PreHandler.js
+++ b/js/lib/ext.core.PreHandler.js
@@ -71,10 +71,8 @@
var Util = require('./mediawiki.Util.js').Util,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- CommentTk = defines.CommentTk,
+var CommentTk = defines.CommentTk,
EOFTk = defines.EOFTk,
- NlTk = defines.NlTk,
TagTk = defines.TagTk,
SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
diff --git a/js/lib/ext.core.QuoteTransformer.js
b/js/lib/ext.core.QuoteTransformer.js
index 15fd30a..307c60a 100644
--- a/js/lib/ext.core.QuoteTransformer.js
+++ b/js/lib/ext.core.QuoteTransformer.js
@@ -6,8 +6,7 @@
var Util = require('./mediawiki.Util.js').Util,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- NlTk = defines.NlTk,
+var NlTk = defines.NlTk,
TagTk = defines.TagTk,
EndTagTk = defines.EndTagTk;
@@ -58,7 +57,6 @@
// onNewLine.
QuoteTransformer.prototype.onQuote = function ( token, frame, prevToken ) {
var qlen = token.value.length,
- tokens = [], // output tokens
ctx = {
token: token,
frame: frame,
@@ -68,7 +66,7 @@
frame: frame,
prevToken: prevToken
},
- newToken, tsr;
+ tsr;
if ( ! this.isActive ) {
this.dispatcher.addTransform( this.onNewLine.bind(this),
"QuoteTransformer:onNewLine",
@@ -181,8 +179,7 @@
if (this.italics.length % 2 && this.bolds.length % 2) {
var firstsingleletterword = -1,
firstmultiletterword = -1,
- firstspace = -1,
- lastbold = -1;
+ firstspace = -1;
for (var j = 0; j < this.bolds.length; j++) {
var ctx = this.bolds[j][0];
var ctxPrevToken = ctx.prevToken;
@@ -282,7 +279,6 @@
var toggle = true,
t,
j,
- out = [],
newToken,
nameToWidth = {
b: 3,
diff --git a/js/lib/ext.core.Sanitizer.js b/js/lib/ext.core.Sanitizer.js
index bf3c6bf..98c7827 100644
--- a/js/lib/ext.core.Sanitizer.js
+++ b/js/lib/ext.core.Sanitizer.js
@@ -14,9 +14,7 @@
var Util = require('./mediawiki.Util.js').Util,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- NlTk = defines.NlTk,
- TagTk = defines.TagTk,
+var TagTk = defines.TagTk,
SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
diff --git a/js/lib/ext.core.TemplateHandler.js
b/js/lib/ext.core.TemplateHandler.js
index 5a49c52..21ba2ba 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -10,8 +10,7 @@
"use strict";
-var events = require('events'),
- ParserFunctions =
require('./ext.core.ParserFunctions.js').ParserFunctions,
+var ParserFunctions = require('./ext.core.ParserFunctions.js').ParserFunctions,
AttributeTransformManager =
require('./mediawiki.TokenTransformManager.js')
.AttributeTransformManager,
defines = require('./mediawiki.parser.defines.js'),
@@ -19,7 +18,6 @@
api = require('./mediawiki.ApiRequest.js'),
PreprocessorRequest = api.PreprocessorRequest,
Util = require('./mediawiki.Util.js').Util,
- DOMUtils = require('./mediawiki.DOMUtils.js').DOMUtils,
// define some constructor shortcuts
KV = defines.KV,
TagTk = defines.TagTk,
@@ -561,8 +559,7 @@
TemplateHandler.prototype._onEnd = function( state, cb ) {
this.manager.env.dp( 'TemplateHandler._onEnd' );
if (this.options.wrapTemplates) {
- var tsr = state.token.dataAttribs.tsr,
- endTag = this.getEncapsulationInfoEndTag(state),
+ var endTag = this.getEncapsulationInfoEndTag(state),
res = { tokens: [endTag] };
state.emittedFirstChunk = false;
cb( res );
diff --git a/js/lib/ext.core.TokenStreamPatcher.js
b/js/lib/ext.core.TokenStreamPatcher.js
index 5749143..e9fadeb 100644
--- a/js/lib/ext.core.TokenStreamPatcher.js
+++ b/js/lib/ext.core.TokenStreamPatcher.js
@@ -14,9 +14,7 @@
Util = require('./mediawiki.Util.js').Util,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- CommentTk = defines.CommentTk,
- NlTk = defines.NlTk,
+var CommentTk = defines.CommentTk,
TagTk = defines.TagTk,
SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
diff --git a/js/lib/ext.util.TokenCollector.js
b/js/lib/ext.util.TokenCollector.js
index 84cb776..b53972e 100644
--- a/js/lib/ext.util.TokenCollector.js
+++ b/js/lib/ext.util.TokenCollector.js
@@ -26,8 +26,7 @@
// define some constructor shortcuts
var defines = require('./mediawiki.parser.defines.js');
-var KV = defines.KV,
- EOFTk = defines.EOFTk,
+var EOFTk = defines.EOFTk,
TagTk = defines.TagTk,
SelfclosingTagTk = defines.SelfclosingTagTk,
EndTagTk = defines.EndTagTk;
diff --git a/js/lib/fakejquery.js b/js/lib/fakejquery.js
index cf352bb..9445cc4 100644
--- a/js/lib/fakejquery.js
+++ b/js/lib/fakejquery.js
@@ -17,7 +17,6 @@
function isFunction(value) { return type(value) == "function" }
function isWindow(obj) { return obj != null && obj == obj.window }
- function isDocument(obj) { return obj != null && obj.nodeType ==
obj.DOCUMENT_NODE }
function isObject(obj) { return type(obj) == "object" }
function isPlainObject(obj) {
return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) ==
Object.prototype
@@ -25,7 +24,6 @@
function isArray(value) { return value instanceof Array }
function likeArray(obj) { return typeof obj.length == 'number' }
- function compact(array) { return filter.call(array, function(item){ return
item != null }) }
function flatten(array) { return array.length > 0 ? concat.apply([], array)
: array }
function extend(target, source, deep) {
diff --git a/js/lib/mediawiki.ApiRequest.js b/js/lib/mediawiki.ApiRequest.js
index 6029fa1..b2ce759 100644
--- a/js/lib/mediawiki.ApiRequest.js
+++ b/js/lib/mediawiki.ApiRequest.js
@@ -125,7 +125,7 @@
this._handleJSON( dnee, {} );
}
} else if (response.statusCode === 200) {
- var src = '', data;
+ var data;
try {
//console.warn( 'body: ' + body );
data = JSON.parse( body );
diff --git a/js/lib/mediawiki.DOMDiff.js b/js/lib/mediawiki.DOMDiff.js
index 50e37c5..9945454 100644
--- a/js/lib/mediawiki.DOMDiff.js
+++ b/js/lib/mediawiki.DOMDiff.js
@@ -1,6 +1,4 @@
-var DU = require('./mediawiki.DOMUtils.js').DOMUtils,
- NODE = require('./mediawiki.wikitext.constants.js').Node,
- Util = require('./mediawiki.Util.js').Util;
+var DU = require('./mediawiki.DOMUtils.js').DOMUtils;
/**
* A DOM diff helper class
@@ -52,16 +50,6 @@
'data-parsoid-diff': 1,
'about': 1
};
-
-function countIgnoredAttributes (attributes) {
- var n = 0, i;
- for (i=0; i < attributes.length; i++) {
- if ( ignoreAttributes.hasOwnProperty(attributes.item(i).name) )
{
- n++;
- }
- }
- return n;
-}
/**
* Attribute equality test
@@ -287,7 +275,6 @@
*****************************************************/
DDP.markNode = function(node, change) {
- var markNode;
if ( change === 'deleted' ) {
// insert a meta tag marking the place where content used to be
DU.prependTypedMeta(node, 'mw:DiffMarker');
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 75a5e5c..d35a19f 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -105,7 +105,7 @@
};
DOMTraverser.prototype.callHandlers = function ( node ) {
- var ix, result, handlers, name = ( node.nodeName || '' ).toLowerCase();
+ var ix, result, name = ( node.nodeName || '' ).toLowerCase();
for ( ix = 0; ix < this.handlers.length; ix++ ) {
if ( this.handlers[ix].name === null ||
@@ -122,7 +122,7 @@
* Traverse the DOM and fire the handlers that are registered
*/
DOMTraverser.prototype.traverse = function ( node ) {
- var childDT, nextChild, child = node.firstChild;
+ var nextChild, child = node.firstChild;
while ( child !== null ) {
nextChild = child.nextSibling;
@@ -857,8 +857,7 @@
// now find common ancestor
var elem = endElem;
- var parentNode = endElem.parentNode,
- firstSibling, lastSibling;
+ var parentNode = endElem.parentNode;
var range = null;
while (parentNode && parentNode.nodeType !== Node.DOCUMENT_NODE) {
var i = startAncestors.indexOf( parentNode );
@@ -1385,7 +1384,6 @@
}
function findTableSibling( elem, about ) {
- var tableNode = null;
elem = elem.nextSibling;
while (elem &&
(!DU.hasNodeName(elem, 'table') ||
@@ -1649,8 +1647,7 @@
// and adds autoInsertedEnd/Start flags if it detects the tags to be
inserted by
// the HTML tree builder
function findAutoInsertedTags(node) {
- var children = node.childNodes,
- c = node.firstChild,
+ var c = node.firstChild,
sibling, expectedName;
while (c !== null) {
diff --git a/js/lib/mediawiki.HTML5TreeBuilder.node.js
b/js/lib/mediawiki.HTML5TreeBuilder.node.js
index 4a7252f..1d17aec 100644
--- a/js/lib/mediawiki.HTML5TreeBuilder.node.js
+++ b/js/lib/mediawiki.HTML5TreeBuilder.node.js
@@ -10,8 +10,7 @@
HTML5 = require('./html5/index'),
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
-var KV = defines.KV,
- CommentTk = defines.CommentTk,
+var CommentTk = defines.CommentTk,
EOFTk = defines.EOFTk,
NlTk = defines.NlTk,
TagTk = defines.TagTk,
diff --git a/js/lib/mediawiki.SelectiveSerializer.js
b/js/lib/mediawiki.SelectiveSerializer.js
index e8d4df2..c8a88a5 100644
--- a/js/lib/mediawiki.SelectiveSerializer.js
+++ b/js/lib/mediawiki.SelectiveSerializer.js
@@ -9,11 +9,6 @@
var WikitextSerializer = require( './mediawiki.WikitextSerializer.js'
).WikitextSerializer,
Util = require( './mediawiki.Util.js' ).Util,
- DU = require( './mediawiki.DOMUtils.js' ).DOMUtils,
- apirql = require( './mediawiki.ApiRequest.js' ),
- DoesNotExistError = apirql.DoesNotExistError,
- // don't redefine Node
- NODE = require('./mediawiki.wikitext.constants.js').Node,
ParserPipelineFactory =
require('./mediawiki.parser.js').ParserPipelineFactory,
DOMDiff = require('./mediawiki.DOMDiff.js').DOMDiff;
@@ -77,8 +72,7 @@
* @param {Function} finalcb The callback for when we've finished serializing
the DOM.
*/
SSP.doSerializeDOM = function ( err, doc, cb, finalcb ) {
- var matchedRes, nonNewline, nls = 0, latestSerID = null,
- self = this;
+ var self = this;
// gwicke: This does not seem to be needed any more?
//Util.stripFirstParagraph( doc );
diff --git a/js/lib/mediawiki.TokenTransformManager.js
b/js/lib/mediawiki.TokenTransformManager.js
index dd85379..e431310 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -1004,7 +1004,7 @@
* templates are already expanded.
*/
AttributeTransformManager.prototype.process = function (attributes) {
- var n, pipe, ref;
+ var n;
// console.warn( 'AttributeTransformManager.process: ' +
JSON.stringify( attributes ) );
// transform each argument (key and value), and handle asynchronous
returns
@@ -1075,8 +1075,6 @@
* constructs like switches.
*/
AttributeTransformManager.prototype.processKeys = function (attributes) {
- var pipe,
- ref;
// console.warn( 'AttributeTransformManager.processKeys: ' +
JSON.stringify(attributes) );
// TODO: wrap in chunk and call
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 31e486a..cecafc1 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -6,7 +6,6 @@
"use strict";
var domino = require( './domino' ),
- path = require('path'),
async = require('async'),
$ = require( './fakejquery' ),
jsDiff = require( 'diff' ),
@@ -436,7 +435,7 @@
* supplied callback with the new KV pairs.
*/
expandParserValueValues: function(kvs, cb, wrapTemplates) {
- var kv, v,
+ var v,
reassembleKV = function( kv, cb2, v ) {
var newKV = Util.clone(kv);
newKV.v = v;
@@ -923,7 +922,7 @@
*/
// FIXME: Dead function? SelectiveSerializer doesn't seem to use this
Util.stripFirstParagraph = function ( node ) {
- var thisnode, hasAttrs, dataParsoid, attrs, exemptAttrs = 0, haveGone =
false;
+ var thisnode, hasAttrs, dataParsoid, attrs, exemptAttrs = 0;
for ( var i = 0; i < node.childNodes.length; i++ ) {
thisnode = node.childNodes[i];
exemptAttrs += Util.getJSONAttribute( thisnode,
'data-ve-changed' ) ? 1 : 0;
diff --git a/js/lib/mediawiki.WikiConfig.js b/js/lib/mediawiki.WikiConfig.js
index 4733dd9..b0fdba8 100644
--- a/js/lib/mediawiki.WikiConfig.js
+++ b/js/lib/mediawiki.WikiConfig.js
@@ -2,10 +2,7 @@
* Per-wiki config library for interfacing with MediaWiki.
*/
-var qs = require( 'querystring' ),
- util = require( 'util' ),
- request = require( 'request' ),
- baseConfig = require( './baseconfig/en.json' ).query,
+var baseConfig = require( './baseconfig/en.json' ).query,
Util = require( './mediawiki.Util.js' ).Util,
request = require( 'request' );
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index bab9f11..b6f93d7 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -871,8 +871,7 @@
// Helper function for getting RT data from the tokens
var getLinkRoundTripData = function( node, state ) {
var tplAttrs = state.tplAttrs,
- dp = node.data.parsoid,
- attribs = node.attributes;
+ dp = node.data.parsoid;
var rtData = {
type: null,
target: null, // filled in below
@@ -2044,7 +2043,6 @@
};
WSP._htmlElementHandler = function (node, state, cb) {
- var attribKVs = DU.getAttributeKVArray(node);
emitStartTag(this._serializeHTMLTag(state, DU.mkTagTk(node)),
node, state, cb);
@@ -2060,7 +2058,7 @@
node, state, cb);
};
-WSP._buildTemplateWT = function(srcParts, cb) {
+WSP._buildTemplateWT = function(srcParts) {
var buf = [],
serializer = this;
srcParts.map(function(part) {
@@ -2407,9 +2405,8 @@
//node.parentNode.removeChild(node);
}
} else {
- var about = DU.isElt(node) ? node.getAttribute("about") || "" :
"";
var child = node.firstChild;
- var next, prev, childIsPre, str;
+ var next, prev, childIsPre;
while (child) {
// Get the next sibling first thing because we may
delete this child
@@ -2431,7 +2428,7 @@
* min, max structure.
*/
WSP.getSepNlConstraints = function(nodeA, sepNlsHandlerA, nodeB,
sepNlsHandlerB) {
- var nlConstraints = { a:{}, b:{} }, bc;
+ var nlConstraints = { a:{}, b:{} };
if (sepNlsHandlerA) {
nlConstraints.a = sepNlsHandlerA(nodeA, nodeB);
nlConstraints.min = nlConstraints.a.min;
@@ -2661,7 +2658,6 @@
var sep,
origNode = node,
src = state.env.page.src,
- constraints = state.sep.constraints,
prevNode = state.sep.lastSourceNode,
dsrA, dsrB;
@@ -2862,11 +2858,6 @@
var dp = node.data.parsoid;
dp.dsr = dp.dsr || [];
-
- var nodeName = node.nodeName.toLowerCase(),
- tkAttribs =
this._getDOMAttribs(node.attributes),
- tkRTInfo = this._getDOMRTInfo(node),
- parentSTX = state.parentSTX;
// Update separator constraints
prev = this._getPrevSeparatorElement(node, state);
diff --git a/js/lib/mediawiki.parser.environment.js
b/js/lib/mediawiki.parser.environment.js
index ca1773a..63f1730 100644
--- a/js/lib/mediawiki.parser.environment.js
+++ b/js/lib/mediawiki.parser.environment.js
@@ -1,13 +1,9 @@
"use strict";
-var Util = require('./mediawiki.Util.js').Util,
- WikiConfig = require( './mediawiki.WikiConfig.js' ).WikiConfig,
+var WikiConfig = require( './mediawiki.WikiConfig.js' ).WikiConfig,
ParsoidConfig = require( './mediawiki.ParsoidConfig.js' ).ParsoidConfig,
ConfigRequest = require( './mediawiki.ApiRequest.js' ).ConfigRequest,
- $ = require( './fakejquery' ),
- title = require('./mediawiki.Title.js'),
- Title = title.Title,
- Namespace = title.Namespace;
+ $ = require( './fakejquery' );
function Tracer(env) {
this.env = env;
diff --git a/js/lib/mediawiki.parser.js b/js/lib/mediawiki.parser.js
index d45f163..96986c5 100644
--- a/js/lib/mediawiki.parser.js
+++ b/js/lib/mediawiki.parser.js
@@ -13,9 +13,6 @@
// make this global for now
// XXX: figure out a way to get away without a global for PEG actions!
var $ = require('./fakejquery'),
- events = require( 'events' ),
- fs = require('fs'),
- path = require('path'),
PegTokenizer = require('./mediawiki.tokenizer.peg.js').PegTokenizer,
TokenTransformManager = require('./mediawiki.TokenTransformManager.js'),
SyncTokenTransformManager =
TokenTransformManager.SyncTokenTransformManager,
@@ -293,8 +290,7 @@
options.isInclude = true;
}
- var pipe,
- cacheType = getCacheKey(type, options);
+ var cacheType = getCacheKey(type, options);
if ( ! this.pipelineCache[cacheType] ) {
this.pipelineCache[cacheType] = [];
}
diff --git a/js/lib/mediawiki.tokenizer.peg.js
b/js/lib/mediawiki.tokenizer.peg.js
index 4b74264..664a73d 100644
--- a/js/lib/mediawiki.tokenizer.peg.js
+++ b/js/lib/mediawiki.tokenizer.peg.js
@@ -12,9 +12,7 @@
path = require('path'),
LRU = require("lru-cache"),
fs = require('fs'),
- events = require('events'),
- Util = require('./mediawiki.Util.js').Util,
- defines = require('./mediawiki.parser.defines.js');
+ events = require('events');
function PegTokenizer( env, canCache ) {
this.env = env;
@@ -62,7 +60,6 @@
* process().
*/
PegTokenizer.prototype._processText = function( text, fullParse, cacheKey ) {
- var out, err;
if ( !this.tokenizer ) {
// Construct a singleton static tokenizer.
var pegSrcPath = path.join( __dirname, 'pegTokenizer.pegjs.txt'
);
diff --git a/js/tests/dumpReader.js b/js/tests/dumpReader.js
index 806f39c..1873f7c 100644
--- a/js/tests/dumpReader.js
+++ b/js/tests/dumpReader.js
@@ -15,7 +15,6 @@
DumpReader.prototype.makeParser = function() {
var self = this,
- complete = false,
stack = [{}],
workspace = {},
buffer = '';
diff --git a/js/tests/mockAPI.js b/js/tests/mockAPI.js
index 768c40d..bc56790 100644
--- a/js/tests/mockAPI.js
+++ b/js/tests/mockAPI.js
@@ -1,13 +1,6 @@
// This file is used to run a stub API that mimicks the MediaWiki interface
// for the purposes of testing extension expansion.
-var express = require('express'),
- path = require('path'),
- fs = require('fs');
-
-var mp = '../lib/',
- Util = require( mp + 'mediawiki.Util.js' ).Util,
- libtr = require(mp + 'mediawiki.ApiRequest.js'),
- DoesNotExistError = libtr.DoesNotExistError;
+var express = require('express');
/* -------------------- web app access points below --------------------- */
@@ -34,7 +27,7 @@
availableActions = {
parse: function ( body, cb ) {
- var opts, content, resultText,
+ var resultText,
text = body.text,
re = /<testextension(?:
([^>]*))?>((?:[^<]|<(?!\/testextension>))*)<\/testextension>/,
replaceString = '<p data-options="$1">$2</p>',
@@ -86,7 +79,7 @@
}
function buildActionList() {
- var i, j, k, action, title,
+ var i, action, title,
actions = Object.keys( availableActions ),
setStr = '';
@@ -101,7 +94,7 @@
}
function buildForm( action ) {
- var i, j, actionDef, param, params, paramList,
+ var i, actionDef, param, params, paramList,
formStr = '';
actionDef = actionDefinitions[action];
diff --git a/js/tests/parse.js b/js/tests/parse.js
index 43c8995..5916220 100755
--- a/js/tests/parse.js
+++ b/js/tests/parse.js
@@ -4,8 +4,7 @@
* Read from STDIN, write to STDOUT.
*/
-var ParserPipelineFactory =
require('../lib/mediawiki.parser.js').ParserPipelineFactory,
- ParserEnv =
require('../lib/mediawiki.parser.environment.js').MWParserEnvironment,
+var ParserEnv =
require('../lib/mediawiki.parser.environment.js').MWParserEnvironment,
ParsoidConfig = require( '../lib/mediawiki.ParsoidConfig.js'
).ParsoidConfig,
WikitextSerializer =
require('../lib/mediawiki.WikitextSerializer.js').WikitextSerializer,
SelectiveSerializer = require(
'../lib/mediawiki.SelectiveSerializer.js' ).SelectiveSerializer,
diff --git a/js/tests/parserTests.js b/js/tests/parserTests.js
index c8d05bf..9fde2f5 100755
--- a/js/tests/parserTests.js
+++ b/js/tests/parserTests.js
@@ -16,14 +16,11 @@
var fs = require('fs'),
path = require('path'),
- jsDiff = require('diff'),
colors = require('colors'),
Util = require( '../lib/mediawiki.Util.js' ).Util,
childProc = require('child_process'),
- spawn = childProc.spawn,
fork = childProc.fork,
DOMUtils = require( '../lib/mediawiki.DOMUtils.js' ).DOMUtils,
- util = require( 'util' ),
async = require( 'async' ),
PEG = require('pegjs'),
Alea = require('alea'),
@@ -54,8 +51,6 @@
// For now most modules only need this for $.extend and $.each :)
var $ = require(mp + 'fakejquery');
-
-var pj = path.join;
// Our code...
@@ -436,9 +431,6 @@
serializer = (mode === 'selser') ? new
SelectiveSerializer({env: this.env})
: new WikitextSerializer({env: this.env}),
wt = '',
- changelist = [],
- waiting = 0,
- changesReturn,
self = this,
startsAtWikitext = mode === 'wt2wt' || mode === 'wt2html' ||
mode === 'selser';
try {
@@ -591,8 +583,6 @@
// This function won't actually change anything, but it will add change
// markers to random elements.
var child, i, changeObj, node, changelist = [], numAttempts = 0;
-
- var initContent = content;
if ( content.nodeType === content.DOCUMENT_NODE ) {
content = content.body;
@@ -1086,7 +1076,6 @@
*/
ParserTests.prototype.printResult = function ( title, time, comments, iopts,
expected, actual, options, mode, item ) {
var quick = booleanOption( options.quick );
- var quiet = booleanOption( options.quiet );
if ( mode === 'selser' ) {
title += ' ' + JSON.stringify( item.changes );
@@ -1731,7 +1720,6 @@
reportResultXML = function ( title, time, comments, iopts, expected,
actual, options, mode, item ) {
var timeTotal, testcaseEle;
var quick = booleanOption( options.quick );
- var quiet = booleanOption( options.quiet );
if ( mode === 'selser' ) {
title += ' ' + JSON.stringify( item.changes );
diff --git a/js/tests/roundtrip-test.js b/js/tests/roundtrip-test.js
index 1ab21c9..ecac352 100755
--- a/js/tests/roundtrip-test.js
+++ b/js/tests/roundtrip-test.js
@@ -1,10 +1,7 @@
#!/usr/bin/env node
"use strict";
-var fs = require( 'fs' ),
- path = require( 'path' ),
- http = require( 'http' ),
- jsDiff = require( 'diff' ),
+var jsDiff = require( 'diff' ),
optimist = require( 'optimist' ),
Util = require( '../lib/mediawiki.Util.js' ).Util,
@@ -239,7 +236,6 @@
var normalizeWikitext = function ( str ) {
- var orig = str;
// Ignore leading tabs vs. leading spaces
str = str.replace(/^\t/, ' ');
@@ -367,7 +363,7 @@
};
var roundTripDiff = function ( env, document, cb ) {
- var curPair, out, patch, diff, offsetPairs;
+ var out, diff, offsetPairs;
try {
out = new WikitextSerializer( { env: env }
).serializeDOM(document.body);
diff --git a/js/tests/server/server.js b/js/tests/server/server.js
index 9a0d2d5..9f0e5d5 100755
--- a/js/tests/server/server.js
+++ b/js/tests/server/server.js
@@ -2,10 +2,8 @@
( function () {
"use strict";
-var http = require( 'http' ),
- express = require( 'express' ),
+var express = require( 'express' ),
sqlite = require( 'sqlite3' ),
- dbStack = [], dbFlag = false,
argv = require( 'optimist' ).argv,
db = new sqlite.Database( argv._[0] || '/mnt/rtserver/pages.db' ),
// The maximum number of tries per article
@@ -14,8 +12,6 @@
maxFetchRetries = 6,
// "Random" estimate of how many pending pages we have in the db
pendingPagesEstimate = 500;
-
-var counter = 0;
// ----------------- Prepared queries --------------
var dbGetTitle = db.prepare(
@@ -620,7 +616,7 @@
dbFailsQuery.all( [ offset ],
function ( err, rows ) {
- var i, row, output, matches, total = {};
+ var i, row;
if ( err ) {
res.send( err.toString(), 500 );
--
To view, visit https://gerrit.wikimedia.org/r/60848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I685ccd8e388fd3acf75053a07e2f729398fa2855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
