http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73889
Revision: 73889
Author: thomasv
Date: 2010-09-28 14:11:10 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
prepend 'ext.' to extension modules names; replace addOnloadHook() with
.ready() ; hookEvent('load') is still needed for headers, to avoid interactions
with custom toolbar scripts
Modified Paths:
--------------
trunk/extensions/ProofreadPage/ProofreadPage_body.php
trunk/extensions/ProofreadPage/proofread.js
trunk/extensions/ProofreadPage/proofread_index.js
Modified: trunk/extensions/ProofreadPage/ProofreadPage_body.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-09-28
14:10:38 UTC (rev 73888)
+++ trunk/extensions/ProofreadPage/ProofreadPage_body.php 2010-09-28
14:11:10 UTC (rev 73889)
@@ -57,7 +57,7 @@
public static function resourceLoaderRegisterModules() {
ResourceLoader::register(
- 'proofreadpage.page',
+ 'ext.proofreadpage.page',
new ResourceLoaderFileModule(
array(
'scripts' =>
'extensions/ProofreadPage/proofread.js',
@@ -82,7 +82,7 @@
);
ResourceLoader::register(
- 'proofreadpage.article',
+ 'ext.proofreadpage.article',
new ResourceLoaderFileModule(
array(
'scripts' =>
'extensions/ProofreadPage/proofread_article.js'
@@ -91,7 +91,7 @@
);
ResourceLoader::register(
- 'proofreadpage.index',
+ 'ext.proofreadpage.index',
new ResourceLoaderFileModule( array( 'scripts' =>
'extensions/ProofreadPage/proofread_index.js' ) )
);
@@ -354,7 +354,7 @@
}
function prepareIndex( $out ) {
- $out->addModules( 'proofreadpage.index' );
+ $out->addModules( 'ext.proofreadpage.index' );
$out->addInlineScript("
var prp_index_attributes = \"" . Xml::escapeJsString( wfMsgForContent(
'proofreadpage_index_attributes' ) ) . "\";
var prp_default_header = \"" . Xml::escapeJsString( wfMsgGetKey(
'proofreadpage_default_header', true, true, false ) ) . "\";
@@ -409,7 +409,7 @@
);
$out->addInlineScript( ResourceLoader::makeConfigSetScript(
$jsVars ) );
- $out->addModules( 'proofreadpage.page' );
+ $out->addModules( 'ext.proofreadpage.page' );
return true;
}
@@ -1523,7 +1523,7 @@
$indexlink = $sk->link( $nt, wfMsg(
'proofreadpage_source' ),
array( 'title' => wfMsg(
'proofreadpage_source_message' ) ) );
$out->addInlineScript(
ResourceLoader::makeConfigSetScript( array( 'proofreadpage_source_href' =>
$indexlink ) ) );
- $out->addModules( 'proofreadpage.article' );
+ $out->addModules( 'ext.proofreadpage.article' );
}
$q0 = $n0 * 100 / $n;
Modified: trunk/extensions/ProofreadPage/proofread.js
===================================================================
--- trunk/extensions/ProofreadPage/proofread.js 2010-09-28 14:10:38 UTC (rev
73888)
+++ trunk/extensions/ProofreadPage/proofread.js 2010-09-28 14:11:10 UTC (rev
73889)
@@ -166,14 +166,8 @@
pageHeader = pageHeader.split( '&' ).join( '&' );
pageFooter = pageFooter.split( '&' ).join( '&' );
- if ( !self.proofreadpage_show_headers ) {
- headers_style = 'display:none';
- } else {
- headers_style = '';
- }
-
container.innerHTML = '' +
- '<div id="prp_header" style="' + headers_style + '">' +
+ '<div id="prp_header" style="">' +
'<span style="color:gray;font-size:80%;line-height:100%;">' +
escapeQuotesHTML( mediaWiki.msg.get( 'proofreadpage_header' ) )
+ '</span>' +
'<textarea name="wpHeaderTextbox" rows="2" cols="80"
tabindex=1>' + pageHeader + '</textarea><br />' +
@@ -181,7 +175,7 @@
escapeQuotesHTML( mediaWiki.msg.get( 'proofreadpage_body' ) ) +
'</span></div>' +
'<textarea name="wpTextbox1" id="wpTextbox1" tabindex=1
style="height:' + ( self.DisplayHeight - 6 ) + 'px;">' +
pageBody + '</textarea>' +
- '<div id="prp_footer" style="' + headers_style + '">' +
+ '<div id="prp_footer" style="">' +
'<span style="color:gray;font-size:80%;line-height:100%;">' +
escapeQuotesHTML( mediaWiki.msg.get( 'proofreadpage_footer' ) )
+ '</span><br />' +
'<textarea name="wpFooterTextbox" rows="2" cols="80"
tabindex=1>' +
@@ -723,7 +717,7 @@
}
function pr_setup() {
- self.pr_horiz = ( self.proofreadpage_default_layout ==' horizontal' );
+ self.pr_horiz = ( self.proofreadpage_default_layout == 'horizontal' );
if( !proofreadPageIsEdit ) {
pr_horiz = false;
}
@@ -804,6 +798,11 @@
pr_make_edit_area( self.text_container, new_text.value );
var copywarn = document.getElementById( 'editpage-copywarn' );
f.insertBefore( table, copywarn );
+ if ( !self.proofreadpage_show_headers ) {
+ hookEvent( 'load', pr_toggle_visibility );
+ } else {
+ hookEvent( 'load', pr_reset_size );
+ }
} else {
self.text_container.appendChild( new_text );
f.appendChild( self.table );
@@ -951,10 +950,10 @@
}
}
-addOnloadHook( pr_init );
-addOnloadHook( pr_init_tabs );
+$(document).ready( pr_init );
+$(document).ready( pr_init_tabs );
+$(document).ready( pr_initzoom );
-hookEvent( 'load', pr_initzoom );
/* Quality buttons */
self.pr_add_quality = function( form, value ) {
@@ -1032,4 +1031,4 @@
}
}
-addOnloadHook( pr_add_quality_buttons );
\ No newline at end of file
+$(document).ready( pr_add_quality_buttons );
Modified: trunk/extensions/ProofreadPage/proofread_index.js
===================================================================
--- trunk/extensions/ProofreadPage/proofread_index.js 2010-09-28 14:10:38 UTC
(rev 73888)
+++ trunk/extensions/ProofreadPage/proofread_index.js 2010-09-28 14:11:10 UTC
(rev 73889)
@@ -131,5 +131,4 @@
form.elements['wpTextbox1'].value = result;
}
-// use hookevent instead of addOnLoadHook, so that the code is evaluated after
wikibits.js
-hookEvent( 'load', proofreadpage_index_init );
\ No newline at end of file
+$(document).ready( proofreadpage_index_init );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
