Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .eslintrc.json

This file was deleted.

5 changes: 3 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-env node, es6 */
'use strict';

module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
const conf = grunt.file.readJSON( 'extension.json' );

grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-eslint' );
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
fixes:
- "/var/www/html/extensions/CreatePage/::"
- "/var/www/html/extensions/CreatePage/::"
31 changes: 31 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

const { defineConfig } = require( 'eslint/config' );
const wikimedia = require( 'eslint-config-wikimedia/flat' );

module.exports = defineConfig( [
// These run in Node and have their own config below
{
ignores: [ 'Gruntfile.js', 'eslint.config.js' ],
extends: [ wikimedia( 'client/common', 'jquery', 'mediawiki' ) ],
languageOptions: {
globals: {
mediaWiki: 'readonly'
}
},
rules: {
'no-jquery/no-global-selector': 'warn'
}
},
{
// MediaWiki 1.40 still serves JavaScript to ES5 browsers
files: [ 'modules/**/*.js' ],
languageOptions: {
ecmaVersion: 5
}
},
{
files: [ 'Gruntfile.js', 'eslint.config.js' ],
extends: [ wikimedia( 'server' ) ]
}
] );
9 changes: 6 additions & 3 deletions modules/createPage.searchSuggest.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,18 @@
searchNS = 0;
}

$.data( node, 'request', api.get( {
// .then() would return a new promise without the abort() that cancel needs
var request = api.get( {
action: 'opensearch',
search: query,
namespace: searchNS,
limit: maxRows,
suggest: ''
} ).done( function ( data ) {
} );
request.then( function ( data ) {
response( data[ 1 ] );
} ) );
} );
$.data( node, 'request', request );
},
cancel: function () {
var node = this[ 0 ],
Expand Down
Loading
Loading