Jeroen De Dauw has submitted this change and it was merged.
Change subject: JSHint: Too many var statements
......................................................................
JSHint: Too many var statements
Change-Id: I8431035f5ab99392b2803826026bb23db0bbdec7
---
M resources/ep.addcourse.js
M resources/ep.api.js
M resources/ep.articletable.js
M resources/ep.combobox.js
M resources/ep.enlist.js
M resources/ep.js
M resources/ep.pager.js
M resources/jquery.imageinput.js
8 files changed, 75 insertions(+), 57 deletions(-)
Approvals:
Jeroen De Dauw: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/resources/ep.addcourse.js b/resources/ep.addcourse.js
index adb6fde..2e836a4 100644
--- a/resources/ep.addcourse.js
+++ b/resources/ep.addcourse.js
@@ -23,11 +23,12 @@
);
} );
- var list = [ 'neworg', 'newname', 'newterm' ];
+ var list = [ 'neworg', 'newname', 'newterm' ],
+ i, $element, val;
- for ( var i in list ) {
+ for ( i in list ) {
if ( list.hasOwnProperty( i ) ) {
- var $element = $( '#' + list[i] ),
+ $element = $( '#' + list[i] ),
val = $element.val();
$element.removeAttr( 'value' );
@@ -39,4 +40,4 @@
} );
-})( window.jQuery );
\ No newline at end of file
+})( window.jQuery );
diff --git a/resources/ep.api.js b/resources/ep.api.js
index 6daab49..c5df60c 100644
--- a/resources/ep.api.js
+++ b/resources/ep.api.js
@@ -11,13 +11,15 @@
mw.educationProgram.api = {
enlist: function( args ) {
- var requestArgs = $.extend( {
+ var requestArgs, deferred;
+
+ requestArgs = $.extend( {
'action': 'enlist',
'format': 'json',
'token': window.mw.user.tokens.get( 'editToken'
)
}, args );
- var deferred = $.Deferred();
+ deferred = $.Deferred();
$.post(
mw.config.get( 'wgScriptPath' ) + '/api.php',
@@ -46,7 +48,9 @@
},
remove: function( data, args ) {
- var requestArgs = $.extend( {
+ var requestArgs, deferred;
+
+ requestArgs = $.extend( {
'action': 'deleteeducation',
'format': 'json',
'token': window.mw.user.tokens.get( 'editToken'
),
@@ -54,7 +58,7 @@
'type': data.type
}, args );
- var deferred = $.Deferred();
+ deferred = $.Deferred();
$.post(
mw.config.get( 'wgScriptPath' ) + '/api.php',
diff --git a/resources/ep.articletable.js b/resources/ep.articletable.js
index 14e2fae..00952be 100644
--- a/resources/ep.articletable.js
+++ b/resources/ep.articletable.js
@@ -9,9 +9,11 @@
(function( $, ep ) {
function addReviewer() {
- var $this = $( this );
+ var $this, $form, $dialog;
- var $form = $( '<form>' ).attr( {
+ $this = $( this );
+
+ $form = $( '<form>' ).attr( {
'method': 'post',
'action': window.location
} ).msg(
@@ -39,7 +41,7 @@
'value': $this.attr( 'data-article-id' )
} ) );
- var $dialog = $( '<div>' ).html( '' ).dialog( {
+ $dialog = $( '<div>' ).html( '' ).dialog( {
'title': ep.msg('ep-articletable-addreviwer-title',
mw.user.getName() ),
'minWidth': 550,
'buttons': [
@@ -64,9 +66,11 @@
}
function removeStudent() {
- var $this = $( this );
+ var $this, $form, $dialog;
- var $form = $( '<form>' ).attr( {
+ $this = $( this );
+
+ $form = $( '<form>' ).attr( {
'method': 'post',
'action': window.location
} ).msg(
@@ -100,7 +104,7 @@
'value': $this.attr( 'data-course-id' )
} ) );
- var $dialog = $( '<div>' ).html( '' ).dialog( {
+ $dialog = $( '<div>' ).html( '' ).dialog( {
'title': ep.msg('ep-articletable-remstudent-title',
mw.user.getName() ),
'minWidth': 550,
'buttons': [
@@ -126,12 +130,12 @@
function removeArticle() {
var $this = $( this ),
+ $dialog,
courseName = $this.attr( 'data-course-name' ),
isSelf = $this.attr( 'data-student-name' ) === undefined,
selfSuffix = isSelf ? '-self' : '',
- studentName = isSelf ? mw.user.getName() : $this.attr(
'data-student-name' );
-
- var $form = $( '<form>' ).attr( {
+ studentName = isSelf ? mw.user.getName() : $this.attr(
'data-student-name' ),
+ $form = $( '<form>' ).attr( {
'method': 'post',
'action': $this.attr( 'data-remove-target' )
} ).msg(
@@ -159,7 +163,7 @@
'value': $this.attr( 'data-article-id' )
} ) );
- var $dialog = $( '<div>' ).html( '' ).dialog( {
+ $dialog = $( '<div>' ).html( '' ).dialog( {
'title': ep.msg( 'ep-articletable-remarticle-title',
$this.attr( 'data-article-name' ) ),
'minWidth': 550,
'buttons': [
@@ -185,11 +189,12 @@
function removeReviewer() {
var $this = $( this ),
+ $dialog, $form,
isSelf = $this.attr( 'data-reviewer-name' ) === undefined,
selfSuffix = isSelf ? '-self' : '',
reviewerName = isSelf ? mw.user.getName() : $this.attr(
'data-reviewer-name' );
- var $form = $( '<form>' ).attr( {
+ $form = $( '<form>' ).attr( {
'method': 'post',
'action': window.location
} ).msg(
@@ -226,7 +231,7 @@
} ) );
}
- var $dialog = $( '<div>' ).html( '' ).dialog( {
+ $dialog = $( '<div>' ).html( '' ).dialog( {
'title': ep.msg('ep-articletable-remreviwer-title' +
selfSuffix, reviewerName ),
'minWidth': 550,
'buttons': [
diff --git a/resources/ep.combobox.js b/resources/ep.combobox.js
index 77774ee..f979c1f 100644
--- a/resources/ep.combobox.js
+++ b/resources/ep.combobox.js
@@ -10,11 +10,13 @@
$.widget( "ep.combobox", {
_create: function() {
- var self = this,
+ var self, input;
+
+ self = this,
select = this.element.hide(),
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "";
- var input = this.input = $( "<input>" )
+ input = this.input = $( "<input>" )
.insertAfter( select )
.val( value )
.autocomplete({
@@ -128,4 +130,4 @@
} );
-})( window.jQuery );
\ No newline at end of file
+})( window.jQuery );
diff --git a/resources/ep.enlist.js b/resources/ep.enlist.js
index 856c79d..eebd78f 100644
--- a/resources/ep.enlist.js
+++ b/resources/ep.enlist.js
@@ -20,11 +20,13 @@
userName = $this.attr( 'data-username' ),
bestName = $this.attr( 'data-bestname' ),
role = $this.attr( 'data-role' ),
- $dialog = undefined;
+ $dialog = undefined,
+ summaryLabel, summaryInput,
+ doRemove;
- var doRemove = function() {
- var $remove = $( '#ep-' + role +
'-remove-button' );
- var $cancel = $( '#ep-' + role +
'-cancel-button' );
+ doRemove = function() {
+ var $remove = $( '#ep-' + role +
'-remove-button' ),
+ $cancel = $( '#ep-' + role +
'-cancel-button' );
$remove.button( 'option', 'disabled', true );
$remove.button( 'option', 'label', ep.msg(
'ep-' + role + '-removing' ) );
@@ -54,11 +56,11 @@
} );
};
- var summaryLabel = $( '<label>' ).attr( {
+ summaryLabel = $( '<label>' ).attr( {
'for': 'epenlistsummary'
} ).msg( 'ep-' + role + '-summary' ).append( ' ' );
- var summaryInput = $( '<input>' ).attr( {
+ summaryInput = $( '<input>' ).attr( {
'type': 'text',
'size': 60,
'maxlength': 250,
@@ -138,7 +140,8 @@
this.doAdd = function() {
var $add = $( '#ep-' + role + '-add-button' ),
- $cancel = $( '#ep-' + role +
'-add-cancel-button' );
+ $cancel = $( '#ep-' + role +
'-add-cancel-button' ),
+ enterHandler;
$add.button( 'option', 'disabled', true );
$add.button( 'option', 'label', ep.msg( 'ep-' +
role + '-adding' ) );
@@ -149,7 +152,7 @@
'reason': _this.summaryInput.val(),
'role': role
} ).done( function( data ) {
- var messageKey = null;
+ var messageKey = null, $ul;
if ( data.count === 0 ) {
messageKey = 'ep-' + role +
'-addittion-null';
@@ -170,10 +173,10 @@
if ( data.count > 0 ) {
// TODO: link name to user page
and show control links
- var $ul = $( '#ep-course-' +
role ).find( 'ul' );
+ $ul = $( '#ep-course-' + role
).find( 'ul' );
if ( $ul.length < 1 ) {
- var $ul = $( '<ul>' );
+ $ul = $( '<ul>' );
$( '#ep-course-' + role
).html( $ul );
}
@@ -268,7 +271,7 @@
this.nameInput.focus();
}
- var enterHandler = function( event ) {
+ enterHandler = function( event ) {
if ( event.which == '13' ) {
event.preventDefault();
diff --git a/resources/ep.js b/resources/ep.js
index e026dd2..f0f8408 100644
--- a/resources/ep.js
+++ b/resources/ep.js
@@ -8,9 +8,8 @@
( function ( $, mw ) {
- var compatMode = undefined;
-
- var ep = {
+ var compatMode = undefined,
+ ep = {
msg: function () {
// Yeah, doing it here, since "mw.loader.using(
'mediawiki.language',"
// does not have mediaWiki.language loaded.
@@ -33,13 +32,13 @@
};
mw.jqueryMsg.htmlEmitter.prototype.gender = function( nodes ) {
- var gender;
+ var gender, forms;
if ( nodes[0] &&
nodes[0].options instanceof mw.Map ){
gender =
nodes[0].options.get( 'gender' );
} else {
gender = nodes[0];
}
- var forms = nodes.slice(1);
+ forms = nodes.slice(1);
return this.language.gender(
gender, forms );
};
}
diff --git a/resources/ep.pager.js b/resources/ep.pager.js
index a7460d7..c529390 100644
--- a/resources/ep.pager.js
+++ b/resources/ep.pager.js
@@ -21,16 +21,18 @@
var $dialog = undefined,
$remove = undefined,
- $summaryInput = undefined;
+ $summaryInput = undefined,
+ showConfirmDialog,
+ onFail;
- var showConfirmDialog = function( args, onConfirm ) {
- var args = $.extend( {
- 'type': 'unknown',
- 'ids': [],
- 'names': []
- }, args );
-
- var deferred = $.Deferred();
+ showConfirmDialog = function( args, onConfirm ) {
+ var names, summaryLabel,
+ args = $.extend( {
+ 'type': 'unknown',
+ 'ids': [],
+ 'names': []
+ }, args ),
+ deferred = $.Deferred();
$dialog = $( '<div>' ).html( '' ).dialog( {
'title': ep.msg( 'ep-pager-confirm-delete-' +
args.type, args.ids.length ),
@@ -58,7 +60,7 @@
$remove = $( '#ep-pager-remove-button' );
- var names = args.names.map( function( name ) {
+ names = args.names.map( function( name ) {
return '<strong>' + mw.html.escape( name ) +
'</strong>';
} ).join( ', ' );
@@ -68,7 +70,7 @@
args.names.length
);
- var summaryLabel = $( '<label>' ).attr( {
+ summaryLabel = $( '<label>' ).attr( {
'for': 'epsummaryinput'
} ).msg( 'ep-pager-summary-message-' + args.type
).append( ' ' );
@@ -93,7 +95,7 @@
return deferred.promise();
};
- var onFail = function( type ) {
+ onFail = function( type ) {
$remove.button( 'option', 'disabled', false );
$remove.button( 'option', 'label', ep.msg(
'ep-pager-retry-button-' + type ) );
};
@@ -112,8 +114,8 @@
ep.api.remove( args, { 'comment':
$summaryInput.val() } ).done( function() {
$dialog.dialog( 'close' );
- var $tr = $this.closest( 'tr' );
- var $table = $tr.closest(
'table' );
+ var $tr = $this.closest( 'tr' ),
+ $table = $tr.closest(
'table' );
if ( $table.find( 'tr' ).length
> 2 ) {
$tr.slideUp( 'slow',
function () {
@@ -141,7 +143,8 @@
$selectAllCheckbox = $( '#ep-pager-select-all-' + $(
this ).attr( 'data-pager-id' ) ),
$table = $selectAllCheckbox.closest( 'table' ),
ids = [],
- names = [];
+ names = [],
+ pagerId;
$table.find( 'tbody' ).find(
'input[type=checkbox]:checked' ).each( function ( i, element ) {
var $element = $( element );
@@ -153,7 +156,7 @@
return;
}
- var pagerId = $( this ).attr( 'data-pager-id' ),
+ pagerId = $( this ).attr( 'data-pager-id' ),
args = {
'type': $( this ).attr( 'data-type' ),
'ids': ids,
diff --git a/resources/jquery.imageinput.js b/resources/jquery.imageinput.js
index 405af17..3b2de72 100644
--- a/resources/jquery.imageinput.js
+++ b/resources/jquery.imageinput.js
@@ -102,10 +102,11 @@
},
function( data ) {
if ( data.query && data.query.pages ) {
- var pages = data.query.pages;
+ var pages = data.query.pages,
+ info;
for ( p in pages ) {
- var info =
pages[p].imageinfo;
+ info =
pages[p].imageinfo;
for ( i in info ) {
callback(
info[i].thumburl );
return;
--
To view, visit https://gerrit.wikimedia.org/r/44978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8431035f5ab99392b2803826026bb23db0bbdec7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
