From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Sat, 22 Jan 2011 21:29:39 +0000 (+0000)
Subject: Port Chick to Resourceloader. Bug 26649
X-Git-Tag: 1.31.0-rc.0~32427
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=fee2a5a3ea439a0878856daa7069206c0b09fc86;p=lhc%2Fweb%2Fwiklou.git

Port Chick to Resourceloader. Bug 26649
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 592128020c..3d8c1440b4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -24,6 +24,9 @@ return array(
 	'skins.simple' => array(
 		'styles' => array( 'skins/simple/main.css' => array( 'media' => 'screen' ) ),
 	),
+	'skins.chick' => array(
+		'styles' => array( 'skins/chick/main.css' => array( 'media' => 'screen,handheld' ) ),
+	),
 
 	/* jQuery */
 
diff --git a/resources/jquery/jquery.placeholder.js b/resources/jquery/jquery.placeholder.js
index 8daa4620a0..024441d013 100644
--- a/resources/jquery/jquery.placeholder.js
+++ b/resources/jquery/jquery.placeholder.js
@@ -38,7 +38,7 @@ $.fn.placeholder = function() {
 			} )
 
 			// Hide on focus
-			.focus( function() {
+			.bind( 'onfocus ondrop ondragdrop', function() {
 				if ($input.hasClass('placeholder')) {
 					this.value = '';
 					$input.removeClass( 'placeholder' );
@@ -58,4 +58,4 @@ $.fn.placeholder = function() {
 		});
 
 	});
-};
\ No newline at end of file
+};
diff --git a/skins/Chick.php b/skins/Chick.php
index c8eb81527c..df78b4bf02 100644
--- a/skins/Chick.php
+++ b/skins/Chick.php
@@ -23,10 +23,12 @@ class SkinChick extends SkinTemplate {
 
 	function setupSkinUserCss( OutputPage $out ){
 		parent::setupSkinUserCss( $out );
-		// Append to the default screen common & print styles...
-		$out->addStyle( 'chick/main.css', 'screen,handheld' );
-		$out->addStyle( 'chick/IE50Fixes.css', 'screen,handheld', 'lt IE 5.5000' );
-		$out->addStyle( 'chick/IE55Fixes.css', 'screen,handheld', 'IE 5.5000' );
-		$out->addStyle( 'chick/IE60Fixes.css', 'screen,handheld', 'IE 6' );
+
+		$out->addModuleStyles( 'skins.chick' );
+
+		// TODO: Migrate all of these
+		//$out->addStyle( 'chick/IE50Fixes.css', 'screen,handheld', 'lt IE 5.5000' );
+		//$out->addStyle( 'chick/IE55Fixes.css', 'screen,handheld', 'IE 5.5000' );
+		//$out->addStyle( 'chick/IE60Fixes.css', 'screen,handheld', 'IE 6' );
 	}
 }