http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95961
Revision: 95961
Author: krinkle
Date: 2011-09-01 10:50:23 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
* addModuleStyles instead of addModule, support noscript-env
* Strict comparison
* Fix usage non-semantic TablePager with mw-data (Introduced in r95960, see
r95818 CR)
Follows-up r95818 (Fixes fixme)
Modified Paths:
--------------
branches/RL2/extensions/Gadgets/Gadgets.php
branches/RL2/extensions/Gadgets/SpecialGadgetManager.php
Added Paths:
-----------
branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.prejs.css
Removed Paths:
-------------
branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.css
Modified: branches/RL2/extensions/Gadgets/Gadgets.php
===================================================================
--- branches/RL2/extensions/Gadgets/Gadgets.php 2011-09-01 10:38:19 UTC (rev
95960)
+++ branches/RL2/extensions/Gadgets/Gadgets.php 2011-09-01 10:50:23 UTC (rev
95961)
@@ -141,8 +141,9 @@
'remoteExtPath' => 'Gadgets/modules'
);
$wgResourceModules += array(
- 'ext.gadgets.gadgetmanager' => $gadResourceTemplate + array(
- 'styles' => 'ext.gadgets.gadgetmanager.css',
+ // Also loaded in if javascript disabled
+ 'ext.gadgets.gadgetmanager.prejs' => $gadResourceTemplate + array(
+ 'styles' => 'ext.gadgets.gadgetmanager.prejs.css',
'position' => 'top',
- )
+ ),
);
Modified: branches/RL2/extensions/Gadgets/SpecialGadgetManager.php
===================================================================
--- branches/RL2/extensions/Gadgets/SpecialGadgetManager.php 2011-09-01
10:38:19 UTC (rev 95960)
+++ branches/RL2/extensions/Gadgets/SpecialGadgetManager.php 2011-09-01
10:50:23 UTC (rev 95961)
@@ -20,7 +20,7 @@
$this->setHeaders();
$out->setPagetitle( wfMsg( 'gadgetmanager-title' ) );
- $out->addModules( 'ext.gadgets.gadgetmanager' );
+ $out->addModuleStyles( 'ext.gadgets.gadgetmanager.prejs' );
// Determine view
if ( is_string( $par ) && $par !== '' ) {
@@ -69,7 +69,7 @@
foreach ( $gadgetsByCategory as $category => $gadgets ) {
// Avoid broken or empty headings. Fallback to a
special message
// for uncategorized gadgets (e.g. gadgets with
category '' ).
- if ( $category != '' ) {
+ if ( $category !== '' ) {
$categoryMsg = wfMessage(
"gadgetcategory-$category" );
} else {
$categoryMsg = wfMessage(
'gadgetmanager-uncategorized' );
@@ -82,7 +82,7 @@
);
// Start per-category gadgets table
- $html .= '<table class="mw-gadgetmanager-gadgets
TablePager"><tr>';
+ $html .= '<table class="mw-gadgetmanager-gadgets
mw-datatable"><tr>';
$html .=
'<th>' . wfMessage(
'gadgetmanager-tablehead-title' )->escaped()
. '</th><th>' . wfMessage(
'gadgetmanager-tablehead-default' )->escaped()
Deleted: branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.css
===================================================================
--- branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.css
2011-09-01 10:38:19 UTC (rev 95960)
+++ branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.css
2011-09-01 10:50:23 UTC (rev 95961)
@@ -1,10 +0,0 @@
-.mw-gadgetmanager-gadgets {
- width: 100%;
-}
-
-.mw-gadgetmanager-gadgets-default,
-.mw-gadgetmanager-gadgets-hidden,
-.mw-gadgetmanager-gadgets-shared {
- width: 4em;
- text-align: center;
-}
Copied:
branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.prejs.css
(from rev 95866,
branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.css)
===================================================================
--- branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.prejs.css
(rev 0)
+++ branches/RL2/extensions/Gadgets/modules/ext.gadgets.gadgetmanager.prejs.css
2011-09-01 10:50:23 UTC (rev 95961)
@@ -0,0 +1,10 @@
+.mw-gadgetmanager-gadgets {
+ width: 100%;
+}
+
+.mw-gadgetmanager-gadgets-default,
+.mw-gadgetmanager-gadgets-hidden,
+.mw-gadgetmanager-gadgets-shared {
+ width: 4em;
+ text-align: center;
+}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
