https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110542
Revision: 110542
Author: krinkle
Date: 2012-02-02 00:47:53 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Enqueue mw.util.init in document-ready even handler earlier
* Previously $(document).ready(mw.util.init) was in module
'mediawiki.page.ready' (position: bottom). I've now moved this to
'mediawiki.page.startup' so that it'll be enqueued sooner.
* This making it more likely that if someone also enqueues in document-ready
that mw.util.init ran before than and thus mw.util.$content populated
* Fixes bug 33711
* All this is still depends on the order in which the event handler queue is
executed, which is risky. Bug 30713 will bring the solid "watertight" solution
Modified Paths:
--------------
trunk/phase3/resources/Resources.php
trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
trunk/phase3/resources/mediawiki.page/mediawiki.page.startup.js
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2012-02-02 00:43:43 UTC (rev
110541)
+++ trunk/phase3/resources/Resources.php 2012-02-02 00:47:53 UTC (rev
110542)
@@ -726,6 +726,7 @@
'scripts' =>
'resources/mediawiki.page/mediawiki.page.startup.js',
'dependencies' => array(
'jquery.client',
+ 'mediawiki.util',
),
'position' => 'top',
),
Modified: trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
===================================================================
--- trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
2012-02-02 00:43:43 UTC (rev 110541)
+++ trunk/phase3/resources/mediawiki.page/mediawiki.page.ready.js
2012-02-02 00:47:53 UTC (rev 110542)
@@ -1,8 +1,5 @@
jQuery( document ).ready( function( $ ) {
- /* Initialize utilities (messageBoxNew, profile, tooltip access keys,
TOC etc.) */
- mw.util.init();
-
/* Emulate placeholder if not supported by browser */
if ( !( 'placeholder' in document.createElement( 'input' ) ) ) {
$( 'input[placeholder]' ).placeholder();
Modified: trunk/phase3/resources/mediawiki.page/mediawiki.page.startup.js
===================================================================
--- trunk/phase3/resources/mediawiki.page/mediawiki.page.startup.js
2012-02-02 00:43:43 UTC (rev 110541)
+++ trunk/phase3/resources/mediawiki.page/mediawiki.page.startup.js
2012-02-02 00:47:53 UTC (rev 110542)
@@ -1,4 +1,4 @@
-( function( $ ) {
+( function ( $ ) {
mw.page = {};
@@ -8,4 +8,11 @@
.addClass('client-js' )
.removeClass( 'client-nojs' );
+ // Initialize utilities as soon as the document is ready
(mw.util.$content,
+ // messageBoxNew, profile, tooltip access keys, Table of contents
toggle, ..).
+ // Enqueued into domready from here instead of mediawiki.page.ready to
ensure that it gets enqueued
+ // before other modules hook into document ready, so that
mw.util.$content (defined by mw.util.init),
+ // is defined for them.
+ $( mw.util.init );
+
} )( jQuery );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
