r80778 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80777‎ | r80778 | r80779 >
Date:23:17, 22 January 2011
Author:krinkle
Status:ok
Tags:
Comment:
Removing commented wgHandheldStyle in Resources.php + wrapping lines at 80 (one-line to multi-line arrays)
* wgHandheldStyle: Is now done from Monobook.php (r75548)
* Some lines were getting over 100 characters in length due to the dependancies array. Spit' a few up to a multiline array
Modified paths:
  • /trunk/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/Resources.php
@@ -17,8 +17,6 @@
1818 'skins.monobook' => array(
1919 'styles' => array(
2020 'skins/monobook/main.css' => array( 'media' => 'screen' ),
21 - // Honor $wgHandheldStyle. This is kind of evil
22 - //$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' ),
2321 ),
2422 ),
2523 'skins.simple' => array(
@@ -352,11 +350,17 @@
353351 'mediawiki' => array(
354352 'scripts' => 'resources/mediawiki/mediawiki.js',
355353 'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
356 - 'debugRaw' => false
 354+ 'debugRaw' => false,
357355 ),
358356 'mediawiki.util' => array(
359357 'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
360 - 'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.cookie', 'jquery.placeholder', 'jquery.makeCollapsible' ),
 358+ 'dependencies' => array(
 359+ 'jquery.checkboxShiftClick',
 360+ 'jquery.client',
 361+ 'jquery.makeCollapsible',
 362+ 'jquery.cookie',
 363+ 'jquery.placeholder',
 364+ ),
361365 'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
362366 ),
363367 'mediawiki.util.jpegmeta' => array(
@@ -389,9 +393,15 @@
390394 'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
391395 ),
392396 'mediawiki.special.upload' => array(
393 - // @todo: merge in remainder of mediawiki.legacy.upload
 397+ // @TODO: merge in remainder of mediawiki.legacy.upload
394398 'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
395 - 'messages' => array( 'widthheight', 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ),
 399+ 'messages' => array(
 400+ 'widthheight',
 401+ 'size-bytes',
 402+ 'size-kilobytes',
 403+ 'size-megabytes',
 404+ 'size-gigabytes',
 405+ ),
396406 'dependencies' => array( 'mediawiki.util.jpegmeta' ),
397407 ),
398408 'mediawiki.language' => array(
@@ -450,7 +460,12 @@
451461 'mediawiki.legacy.ajax' => array(
452462 'scripts' => 'skins/common/ajax.js',
453463 'messages' => array(
454 - 'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', 'tooltip-ca-unwatch',
 464+ 'watch',
 465+ 'unwatch',
 466+ 'watching',
 467+ 'unwatching',
 468+ 'tooltip-ca-watch',
 469+ 'tooltip-ca-unwatch',
455470 ),
456471 'dependencies' => 'mediawiki.legacy.wikibits',
457472 ),

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75548Followup r74966, r75006: load $wgHandheldStyle again in SkinMonoBook. Can't d...catrope15:21, 27 October 2010

Status & tagging log