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

build: Update eslint to 0.4.0 and make pass

Browse source 
Change-Id: Ib0ac14fb53479eb964a5d51066661b4771b1f72e
This commit is contained in:
Ed Sanders 2017-05-04 22:36:58 +01:00 committed by Catrope
parent ba2f387111
commit 1b0bd60ee8
5 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/jquery.wikiEditor.dialogs.config.js
View file

@ -332,7 +332,7 @@
.append( $( '<div>' )
.attr( 'id', 'wikieditor-toolbar-link-int-target-status-loading' )
.append( $( '<img>' ).attr( {
src: $.wikiEditor.imgPath + 'dialogs/' + 'loading-small.gif',
src: $.wikiEditor.imgPath + 'dialogs/loading-small.gif',
alt: loadingMsg,
title: loadingMsg
} ) )
@ -435,6 +435,7 @@
text = '';
}
if ( target === '' ) {
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-link-empty' ) );
return;
}
@ -447,6 +448,7 @@
// FIXME: Exactly how fragile is this?
if ( $( '#wikieditor-toolbar-link-int-target-status-invalid' ).is( ':visible' ) ) {
// Refuse to add links to invalid titles
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-link-int-invalid' ) );
return;
}
@ -915,15 +917,18 @@
cols = parseInt( colsVal, 10 ),
header = $( '#wikieditor-toolbar-table-dimensions-header' ).prop( 'checked' ) ? 1 : 0;
if ( isNaN( rows ) || isNaN( cols ) || String( rows ) !== rowsVal || String( cols ) !== colsVal || rowsVal < 0 || colsVal < 0 ) {
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-table-invalidnumber' ) );
return;
}
if ( rows + header === 0 || cols === 0 ) {
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-table-zero' ) );
return;
}
if ( ( rows * cols ) > 1000 ) {
// 1000 is in the English message. The parameter replacement is kept for BC.
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-table-toomany', 1000 ) );
return;
}

9
modules/jquery.wikiEditor.js
View file

@ -111,12 +111,11 @@
// Fallback to the wikiEditor browser map if no special map is provided in the module
var mod = module && 'browsers' in module ? module : $.wikiEditor;
// Check for and make use of cached value and early opportunities to bail
if ( typeof mod.supported !== 'undefined' ) {
// Cache hit
return mod.supported;
if ( typeof mod.supported === 'undefined' ) {
// Run a browser support test and then cache and return the result
mod.supported = $.client.test( mod.browsers );
}
// Run a browser support test and then cache and return the result
return mod.supported = $.client.test( mod.browsers );
return mod.supported;
},
/**

46
modules/jquery.wikiEditor.publish.js
View file

@ -43,29 +43,29 @@
previewsave: {
id: dialogID,
titleMsg: 'wikieditor-publish-dialog-title',
html: '\
<div class="wikiEditor-publish-dialog-copywarn"></div>\
<div class="wikiEditor-publish-dialog-editoptions">\
<form id="wikieditor-' + context.instance + '-publish-dialog-form">\
<div class="wikiEditor-publish-dialog-summary">\
<label for="wikiEditor-' + context.instance + '-dialog-summary"\
rel="wikieditor-publish-dialog-summary"></label>\
<br />\
<input type="text" id="wikiEditor-' + context.instance + '-dialog-summary"\
style="width: 100%;" />\
</div>\
<div class="wikiEditor-publish-dialog-options">\
<input type="checkbox"\
id="wikiEditor-' + context.instance + '-dialog-minor" />\
<label for="wikiEditor-' + context.instance + '-dialog-minor"\
rel="wikieditor-publish-dialog-minor"></label>\
<input type="checkbox"\
id="wikiEditor-' + context.instance + '-dialog-watch" />\
<label for="wikiEditor-' + context.instance + '-dialog-watch"\
rel="wikieditor-publish-dialog-watch"></label>\
</div>\
</form>\
</div>',
html:
'<div class="wikiEditor-publish-dialog-copywarn"></div>' +
'<div class="wikiEditor-publish-dialog-editoptions">' +
'<form id="wikieditor-' + context.instance + '-publish-dialog-form">' +
'<div class="wikiEditor-publish-dialog-summary">' +
'<label for="wikiEditor-' + context.instance + '-dialog-summary"' +
'rel="wikieditor-publish-dialog-summary"></label>' +
'<br />' +
'<input type="text" id="wikiEditor-' + context.instance + '-dialog-summary"' +
'style="width: 100%;" />' +
'</div>' +
'<div class="wikiEditor-publish-dialog-options">' +
'<input type="checkbox"' +
'id="wikiEditor-' + context.instance + '-dialog-minor" />' +
'<label for="wikiEditor-' + context.instance + '-dialog-minor"' +
'rel="wikieditor-publish-dialog-minor"></label>' +
'<input type="checkbox"' +
'id="wikiEditor-' + context.instance + '-dialog-watch" />' +
'<label for="wikiEditor-' + context.instance + '-dialog-watch"' +
'rel="wikieditor-publish-dialog-watch"></label>' +
'</div>' +
'</form>' +
'</div>',
init: function () {
var i, copyWarnHTML, copyWarnStatements, copyWarnStatement,
newCopyWarnHTML;

9
modules/jquery.wikiEditor.toolbar.js
View file

@ -59,7 +59,8 @@
continue;
}
$group = context.modules.toolbar.$toolbar.find(
'div[rel="' + data.section + '"].section ' + 'div[rel="' + data.group + '"].group'
'div[rel="' + data.section + '"].section ' +
'div[rel="' + data.group + '"].group'
);
for ( tool in data[ type ] ) {
// Tool
@ -96,7 +97,8 @@
continue;
}
$table = context.modules.toolbar.$toolbar.find(
'div[rel="' + data.section + '"].section ' + 'div[rel="' + data.page + '"].page table'
'div[rel="' + data.section + '"].section ' +
'div[rel="' + data.page + '"].page table'
);
for ( i = 0; i < data.rows.length; i++ ) {
// Row
@ -109,7 +111,8 @@
continue;
}
$characters = context.modules.toolbar.$toolbar.find(
'div[rel="' + data.section + '"].section ' + 'div[rel="' + data.page + '"].page div'
'div[rel="' + data.section + '"].section ' +
'div[rel="' + data.page + '"].page div'
);
actions = $characters.data( 'actions' );
for ( i = 0; i < data.characters.length; i++ ) {

2
package.json
View file

@ -4,7 +4,7 @@
"test": "grunt test"
},
"devDependencies": {
"eslint-config-wikimedia": "0.3.0",
"eslint-config-wikimedia": "0.4.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
"grunt-eslint": "19.0.0",