From: Krinkle <krinkle@users.mediawiki.org>
Date: Sat, 22 Jan 2011 23:17:29 +0000 (+0000)
Subject: Removing commented wgHandheldStyle in Resources.php + wrapping lines at 80 (one-line... 
X-Git-Tag: 1.31.0-rc.0~32421
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=91dc45329e1d35e9bed305ad306d69851cf5117c;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 3bd1d3aafd..c68ebda671 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -17,8 +17,6 @@ return array(
 	'skins.monobook' => array(
 		'styles' => array(
 			'skins/monobook/main.css' => array( 'media' => 'screen' ),
-			// Honor $wgHandheldStyle. This is kind of evil
-			//$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' ),
 		),
 	),
 	'skins.simple' => array(
@@ -352,11 +350,17 @@ return array(
 	'mediawiki' => array(
 		'scripts' => 'resources/mediawiki/mediawiki.js',
 		'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
-		'debugRaw' => false
+		'debugRaw' => false,
 	),
 	'mediawiki.util' => array(
 		'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
-		'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.cookie', 'jquery.placeholder', 'jquery.makeCollapsible' ),
+		'dependencies' => array(
+			'jquery.checkboxShiftClick',
+			'jquery.client',
+			'jquery.makeCollapsible',
+			'jquery.cookie',
+			'jquery.placeholder',
+		),
 		'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
 	),
 	'mediawiki.util.jpegmeta' => array(
@@ -389,9 +393,15 @@ return array(
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
 	),
 	'mediawiki.special.upload' => array(
-		// @todo: merge in remainder of mediawiki.legacy.upload
+		// @TODO: merge in remainder of mediawiki.legacy.upload
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
-		'messages' => array( 'widthheight', 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ),
+		'messages' => array(
+			'widthheight',
+			'size-bytes',
+			'size-kilobytes',
+			'size-megabytes',
+			'size-gigabytes',
+		),
 		'dependencies' => array( 'mediawiki.util.jpegmeta' ),
 	),
 	'mediawiki.language' => array(
@@ -450,7 +460,12 @@ return array(
 	'mediawiki.legacy.ajax' => array(
 		'scripts' => 'skins/common/ajax.js',
 		'messages' => array(
-			'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', 'tooltip-ca-unwatch',
+			'watch',
+			'unwatch',
+			'watching',
+			'unwatching',
+			'tooltip-ca-watch',
+			'tooltip-ca-unwatch',
 		),
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	),