Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74079
Change subject: Clean up: Consistently use "$()" instead of "$( document
).ready"
......................................................................
Clean up: Consistently use "$()" instead of "$( document ).ready"
Follows-up I9ed231ef759372.
Change-Id: Ie370fec8c851607f5ea7401e92129f9f60b6268b
---
M includes/installer/WebInstallerPage.php
M resources/mediawiki.action/mediawiki.action.edit.editWarning.js
M resources/mediawiki.action/mediawiki.action.edit.js
M resources/mediawiki.action/mediawiki.action.edit.preview.js
M resources/mediawiki.action/mediawiki.action.history.js
M resources/mediawiki.page/mediawiki.page.patrol.ajax.js
M resources/mediawiki.page/mediawiki.page.watch.ajax.js
M resources/mediawiki.special/mediawiki.special.block.js
M resources/mediawiki.special/mediawiki.special.changeemail.js
M resources/mediawiki.special/mediawiki.special.createAccount.js
M resources/mediawiki.special/mediawiki.special.movePage.js
M resources/mediawiki.special/mediawiki.special.preferences.js
M resources/mediawiki.special/mediawiki.special.recentchanges.js
M resources/mediawiki.special/mediawiki.special.search.js
M resources/mediawiki.special/mediawiki.special.undelete.js
M resources/mediawiki.special/mediawiki.special.upload.js
M resources/mediawiki/mediawiki.htmlform.js
M resources/mediawiki/mediawiki.searchSuggest.js
M skins/common/config.js
M skins/common/upload.js
20 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/74079/1
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 8a9fc2d..6ac1912 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1254,8 +1254,8 @@
$lsUrl = $this->getVar( 'wgServer' ) . $this->parent->getURL(
array( 'localsettings' => 1 ) );
if ( isset( $_SERVER['HTTP_USER_AGENT'] ) &&
strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !==
false ) {
- // JS appears the only method that works consistently
with IE7+
- $this->addHtml( "\n<script>jQuery( document ).ready(
function () { document.location = " .
+ // JS appears to be the only method that works
consistently with IE7+
+ $this->addHtml( "\n<script>jQuery( function () {
document.location = " .
Xml::encodeJsVar( $lsUrl ) . "; }
);</script>\n" );
} else {
$this->parent->request->response()->header( "Refresh:
0;url=$lsUrl" );
diff --git a/resources/mediawiki.action/mediawiki.action.edit.editWarning.js
b/resources/mediawiki.action/mediawiki.action.edit.editWarning.js
index cfe9762..89bb64d 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.editWarning.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.editWarning.js
@@ -2,7 +2,7 @@
* Javascript for module editWarning
*/
( function ( mw, $ ) {
- $( document ).ready( function () {
+ $( function () {
// Check if EditWarning is enabled and if we need it
if ( $( '#wpTextbox1' ).length === 0 ) {
return true;
diff --git a/resources/mediawiki.action/mediawiki.action.edit.js
b/resources/mediawiki.action/mediawiki.action.edit.js
index d29ee42..38d4bb8 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.js
@@ -136,7 +136,7 @@
// Explose API publicly
mw.toolbar = toolbar;
- $( document ).ready( function () {
+ $( function () {
var buttons, i, b, $iframe, editBox, scrollTop, $editForm;
// currentFocus is used to determine where to insert tags
diff --git a/resources/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/mediawiki.action/mediawiki.action.edit.preview.js
index 602aadb..0f95b62 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.preview.js
@@ -101,7 +101,7 @@
} );
}
- $( document ).ready( function () {
+ $( function () {
// Do not enable on user .js/.css pages, as there's no sane way
of "previewing"
// the scripts or styles without reloading the page.
if ( $( '#mw-userjsyoucanpreview' ).length || $(
'#mw-usercssyoucanpreview' ).length ) {
diff --git a/resources/mediawiki.action/mediawiki.action.history.js
b/resources/mediawiki.action/mediawiki.action.history.js
index e9d320c..04f045a 100644
--- a/resources/mediawiki.action/mediawiki.action.history.js
+++ b/resources/mediawiki.action/mediawiki.action.history.js
@@ -1,7 +1,7 @@
/**
* JavaScript for History action
*/
-jQuery( document ).ready( function ( $ ) {
+jQuery( function ( $ ) {
var $historyCompareForm = $( '#mw-history-compare' ),
$historySubmitter,
$lis = $( '#pagehistory > li' );
diff --git a/resources/mediawiki.page/mediawiki.page.patrol.ajax.js
b/resources/mediawiki.page/mediawiki.page.patrol.ajax.js
index d7a07d7..75908ee 100644
--- a/resources/mediawiki.page/mediawiki.page.patrol.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.patrol.ajax.js
@@ -11,7 +11,7 @@
// that didn't have patrolToken yet.
return;
}
- $( document ).ready( function () {
+ $( function () {
var $patrolLinks = $( '.patrollink a' );
$patrolLinks.on( 'click', function ( e ) {
var $spinner, href, rcid, apiRequest;
diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
index 5ba77a1..545cd07 100644
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -100,7 +100,7 @@
updateWatchLink: updateWatchLink
};
- $( document ).ready( function () {
+ $( function () {
var $links = $( '.mw-watchlink a, a.mw-watchlink, ' +
'#ca-watch a, #ca-unwatch a, #mw-unwatch-link1, ' +
'#mw-unwatch-link2, #mw-watch-link2, #mw-watch-link1' );
diff --git a/resources/mediawiki.special/mediawiki.special.block.js
b/resources/mediawiki.special/mediawiki.special.block.js
index 2a158df..b8bcf17 100644
--- a/resources/mediawiki.special/mediawiki.special.block.js
+++ b/resources/mediawiki.special/mediawiki.special.block.js
@@ -2,7 +2,7 @@
* JavaScript for Special:Block
*/
( function ( mw, $ ) {
- $( document ).ready( function () {
+ $( function () {
var $blockTarget = $( '#mw-bi-target' ),
$anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest(
'tr' ),
$enableAutoblockRow = $( '#mw-input-wpAutoBlock'
).closest( 'tr' ),
diff --git a/resources/mediawiki.special/mediawiki.special.changeemail.js
b/resources/mediawiki.special/mediawiki.special.changeemail.js
index 14c2f03..2d22bad 100644
--- a/resources/mediawiki.special/mediawiki.special.changeemail.js
+++ b/resources/mediawiki.special/mediawiki.special.changeemail.js
@@ -23,7 +23,7 @@
}
}
- $( document ).ready( function () {
+ $( function () {
// Lame tip to let user know if its email is valid. See bug
22449.
// Only bind once for 'blur' so that the user can fill it in
without errors;
// after that, look at every keypress for immediate feedback.
diff --git a/resources/mediawiki.special/mediawiki.special.createAccount.js
b/resources/mediawiki.special/mediawiki.special.createAccount.js
index 2cd5625..1281b11 100644
--- a/resources/mediawiki.special/mediawiki.special.createAccount.js
+++ b/resources/mediawiki.special/mediawiki.special.createAccount.js
@@ -5,7 +5,7 @@
// When sending password by email, hide the password input fields.
// This function doesn't need to be loaded early by ResourceLoader, but
is tiny.
- function hidePasswordOnEmail( $ ) {
+ function hidePasswordOnEmail() {
// Always required if checked, otherwise it depends, so we use
the original
var $emailLabel = $( 'label[for="wpEmail"]' ),
originalText = $emailLabel.text(),
@@ -29,7 +29,7 @@
// Move the FancyCaptcha image into a more attractive container.
// This function does need to be run early by ResourceLoader.
- function adjustFancyCaptcha( $, mw ) {
+ function adjustFancyCaptcha() {
var $content = $( '#mw-content-text' ),
$submit = $content.find( '#wpCreateaccount' ),
tabIndex,
@@ -99,9 +99,9 @@
}
}
- $( document ).ready( function( $ ) {
- adjustFancyCaptcha( $, mw);
- hidePasswordOnEmail( $ );
+ $( function () {
+ adjustFancyCaptcha();
+ hidePasswordOnEmail();
} );
}( mediaWiki, jQuery ) );
diff --git a/resources/mediawiki.special/mediawiki.special.movePage.js
b/resources/mediawiki.special/mediawiki.special.movePage.js
index f719d07..922eba5 100644
--- a/resources/mediawiki.special/mediawiki.special.movePage.js
+++ b/resources/mediawiki.special/mediawiki.special.movePage.js
@@ -1,6 +1,6 @@
/**
* JavaScript for Special:MovePage
*/
-jQuery( document ).ready( function ( $ ) {
+jQuery( function ( $ ) {
$( '#wpReason, #wpNewTitleMain' ).byteLimit();
} );
diff --git a/resources/mediawiki.special/mediawiki.special.preferences.js
b/resources/mediawiki.special/mediawiki.special.preferences.js
index 6eaec6a..03d93d0 100644
--- a/resources/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/mediawiki.special/mediawiki.special.preferences.js
@@ -1,7 +1,7 @@
/**
* JavaScript for Special:Preferences
*/
-jQuery( document ).ready( function ( $ ) {
+jQuery( function ( $ ) {
var $preftoc, $preferences, $fieldsets, $legends,
hash,
$tzSelect, $tzTextbox, $localtimeHolder, servertime;
diff --git a/resources/mediawiki.special/mediawiki.special.recentchanges.js
b/resources/mediawiki.special/mediawiki.special.recentchanges.js
index d1c1354..79d793a 100644
--- a/resources/mediawiki.special/mediawiki.special.recentchanges.js
+++ b/resources/mediawiki.special/mediawiki.special.recentchanges.js
@@ -27,7 +27,7 @@
}
};
- $( document ).ready( rc.init );
+ $( rc.init );
mw.special.recentchanges = rc;
diff --git a/resources/mediawiki.special/mediawiki.special.search.js
b/resources/mediawiki.special/mediawiki.special.search.js
index 2dab302..035252b 100644
--- a/resources/mediawiki.special/mediawiki.special.search.js
+++ b/resources/mediawiki.special/mediawiki.special.search.js
@@ -2,7 +2,7 @@
* JavaScript for Special:Search
*/
( function ( mw, $ ) {
- $( document ).ready( function () {
+ $( function () {
var $checkboxes, $headerLinks;
// Emulate HTML5 autofocus behavior in non HTML5 compliant
browsers
diff --git a/resources/mediawiki.special/mediawiki.special.undelete.js
b/resources/mediawiki.special/mediawiki.special.undelete.js
index d20aab5..0dea3ef 100644
--- a/resources/mediawiki.special/mediawiki.special.undelete.js
+++ b/resources/mediawiki.special/mediawiki.special.undelete.js
@@ -1,7 +1,7 @@
/**
* JavaScript for Special:Undelete
*/
-jQuery( document ).ready( function ( $ ) {
+jQuery( function ( $ ) {
$( '#mw-undelete-invert' ).click( function ( e ) {
$( '#undelete input[type="checkbox"]' ).prop( 'checked',
function ( i, val ) {
return !val;
diff --git a/resources/mediawiki.special/mediawiki.special.upload.js
b/resources/mediawiki.special/mediawiki.special.upload.js
index 75532f1..3f40c54 100644
--- a/resources/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -6,7 +6,7 @@
/**
* Add a preview to the upload form
*/
- $( document ).ready( function () {
+ $( function () {
/**
* Is the FileAPI available with sufficient functionality?
*/
@@ -290,7 +290,7 @@
/**
* Disable all upload source fields except the selected one
*/
- $( document ).ready( function () {
+ $( function () {
var i, $row,
$rows = $( '.mw-htmlform-field-UploadSourceField' );
diff --git a/resources/mediawiki/mediawiki.htmlform.js
b/resources/mediawiki/mediawiki.htmlform.js
index f93cac1..77ceee4 100644
--- a/resources/mediawiki/mediawiki.htmlform.js
+++ b/resources/mediawiki/mediawiki.htmlform.js
@@ -125,7 +125,7 @@
} );
}
- $( document ).ready( function() {
+ $( function () {
var $matrixTooltips = $( '.mw-htmlform-matrix
.mw-htmlform-tooltip' );
if ( $matrixTooltips.length ) {
mw.loader.using( 'jquery.tipsy', function () {
diff --git a/resources/mediawiki/mediawiki.searchSuggest.js
b/resources/mediawiki/mediawiki.searchSuggest.js
index 08f10fe..7f07862 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -2,7 +2,7 @@
* Add search suggestions to the search form.
*/
( function ( mw, $ ) {
- $( document ).ready( function ( $ ) {
+ $( function () {
var map, resultRenderCache, searchboxesSelectors,
// Region where the suggestions box will appear
directly below
// (using the same width). Can be a container element
or the input
diff --git a/skins/common/config.js b/skins/common/config.js
index b1e28ab..73a6dba 100644
--- a/skins/common/config.js
+++ b/skins/common/config.js
@@ -1,5 +1,5 @@
( function ( $ ) {
- $( document ).ready( function () {
+ $( function () {
var $label, labelText;
function syncText() {
diff --git a/skins/common/upload.js b/skins/common/upload.js
index df819e1..4246e82 100644
--- a/skins/common/upload.js
+++ b/skins/common/upload.js
@@ -307,6 +307,6 @@
};
-$( document ).ready( uploadSetup );
+$( uploadSetup );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/74079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie370fec8c851607f5ea7401e92129f9f60b6268b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
