From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Sun, 12 Aug 2012 05:04:50 +0000 (+0200)
Subject: Clean up mw.util.jsMessage
X-Git-Tag: 1.31.0-rc.0~22760^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=d791a7e27f99c63493cff75883c5278ad838e337;p=lhc%2Fweb%2Fwiklou.git

Clean up mw.util.jsMessage

* Re-use hideMessage()
* Actually set messageBoxEvents to true so that the one-time
  setup is only set up once.
* Optimize hex colors ({6}->{3}).
  While at it, also ran it for the rest of the file.

* Follows-up I41c70d78

Change-Id: I1863b62003edc825fdefe53d02c2d22e36409234
---

diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 38c19c4480..d1bfd056b1 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -454,13 +454,12 @@
 				}
 
 				if ( !messageBoxEvents ) {
+					messageBoxEvents = true;
 					$messageDiv
 						.on( {
 							'mouseenter': stopHideMessageTimeout,
 							'mouseleave': startHideMessageTimeout,
-							'click': function() {
-								$(this).fadeOut( 'slow' );
-							}
+							'click': hideMessage
 						} )
 						.on( 'click', 'a', function ( e ) {
 							// Prevent links, even those that don't exist yet, from causing the
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index e74bd96d16..a07c73468a 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -197,7 +197,7 @@ div.vectorTabs span {
 }
 div.vectorTabs li.selected a,
 div.vectorTabs li.selected a:visited{
-	color: #333333;
+	color: #333;
 	text-decoration: none;
 }
 div.vectorTabs li.new a,
@@ -342,7 +342,7 @@ div.vectorMenu li > a {
 }
 div.vectorMenu li.selected a,
 div.vectorMenu li.selected a:visited {
-	color: #333333;
+	color: #333;
 	text-decoration: none;
 }
 /* Search */
@@ -369,7 +369,7 @@ div#simpleSearch {
 	margin-top: 0.65em;
 	position: relative;
 	min-height: 1px; /* Gotta trigger hasLayout for IE7 */
-	border: solid 1px #AAAAAA;
+	border: solid 1px #aaa;
 	color: black;
 	background-color: white;
 	/* @embed */
@@ -394,10 +394,10 @@ div#simpleSearch input:focus {
 	outline: none;
 }
 div#simpleSearch input.placeholder {
-	color: #999999;
+	color: #999;
 }
 div#simpleSearch input::-webkit-input-placeholder {
-	color: #999999;
+	color: #999;
 }
 div#simpleSearch input#searchInput {
 	position: absolute;
@@ -459,7 +459,7 @@ div#mw-panel div.portal {
 }
 div#mw-panel div.portal h5 {
 	font-weight: normal;
-	color: #444444;
+	color: #444;
 	padding: 0.25em;
 	padding-top: 0;
 	padding-left: 1.75em;
@@ -520,7 +520,7 @@ div#footer ul li {
 	padding: 0;
 	padding-top: 0.5em;
 	padding-bottom: 0.5em;
-	color: #333333;
+	color: #333;
 	font-size: 0.7em;
 }
 div#footer #footer-icons {
@@ -619,7 +619,7 @@ div#footer #footer-places li {
 		background-image: url(images/preferences-fade.png);
 		background-position: bottom;
 		background-repeat: repeat-x;
-		color: #333333;
+		color: #333;
 		text-decoration: none;
 	}
 #preferences {
@@ -628,14 +628,14 @@ div#footer #footer-places li {
 	margin: 0;
 	margin-top: -2px;
 	clear: both;
-	border: solid 1px #cccccc;
+	border: solid 1px #ccc;
 	background-color: #f9f9f9;
 	/* @embed */
 	background-image: url(images/preferences-base.png);
 }
 #preferences fieldset {
 	border: none;
-	border-top: solid 1px #cccccc;
+	border-top: solid 1px #ccc;
 }
 #preferences fieldset.prefsection {
 	border: none;
@@ -643,7 +643,7 @@ div#footer #footer-places li {
 	margin: 1em;
 }
 #preferences legend {
-	color: #666666;
+	color: #666;
 }
 #preferences fieldset.prefsection legend.mainLegend {
 	display: none;
@@ -655,7 +655,7 @@ div#footer #footer-places li {
 .htmlform-tip {
 	font-size: x-small;
 	padding: .2em 2em;
-	color: #666666;
+	color: #666;
 }
 #preferences div.mw-prefs-buttons {
 	padding: 1em;
@@ -785,7 +785,7 @@ div#content a.external[href *=".pdf?"], div#content a.external[href *=".PDF?"],
 	width: 100%;
 }
 div#mw-js-message {
-	background-color: #ffffff;
+	background-color: #fff;
 	background-color: rgba(255, 255, 255, 0.93);
 	font-size: 0.8em;
 	position: absolute;