<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29020] trunk/src: Focus and blur styling (via JS) for the install screen language selector.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29020">29020</a></dd>
<dt>Author</dt> <dd>johnbillion</dd>
<dt>Date</dt> <dd>2014-07-08 00:29:47 +0000 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Focus and blur styling (via JS) for the install screen language selector. Props jorbin. See <a href="http://core.trac.wordpress.org/ticket/28577">#28577</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjslanguagechooserjs">trunk/src/wp-admin/js/language-chooser.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/install.css (29019 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/install.css 2014-07-07 22:40:33 UTC (rev 29019)
+++ trunk/src/wp-admin/css/install.css 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -337,7 +337,6 @@
</span><span class="cx"> height: 250px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* TODO:add focus style via JS */
</del><span class="cx"> .language-chooser fieldset.focus {
</span><span class="cx"> border-color: #5b9dd9;
</span><span class="cx"> -webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
</span><span class="lines">@@ -355,9 +354,17 @@
</span><span class="cx">
</span><span class="cx"> .language-chooser input:checked + label{
</span><span class="cx"> color:white;
</span><ins>+ background: #777;
+}
+
+.language-chooser .focus input:checked + label{
</ins><span class="cx"> background: #0074A2;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.language-chooser label:hover {
+ background: #eee;
+}
+
</ins><span class="cx"> .language-chooser label{
</span><span class="cx"> display:block;
</span><span class="cx"> }
</span><span class="lines">@@ -373,3 +380,5 @@
</span><span class="cx"> clip: rect(0 0 0 0);
</span><span class="cx"> border: 0;
</span><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/upgrade.php (29019 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/upgrade.php 2014-07-07 22:40:33 UTC (rev 29019)
+++ trunk/src/wp-admin/includes/upgrade.php 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -2162,7 +2162,7 @@
</span><span class="cx"> function wp_install_language_form( $languages ) {
</span><span class="cx"> echo "<fieldset>\n";
</span><span class="cx"> echo "<legend class='screen-reader-text'>Select a default language</legend>\n";
</span><del>- echo '<input type="radio" checked="checked" class="screen-reader-input" name="language" id="language_default" value="">';
</del><ins>+ echo '<input type="radio" checked="checked" class="screen-reader-input language-chooser-input" name="language" id="language_default" value="">';
</ins><span class="cx"> echo '<label for="language_default">English (United States)</label>';
</span><span class="cx"> echo "\n";
</span><span class="cx">
</span><span class="lines">@@ -2175,7 +2175,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( $languages as $language ) {
</span><del>- echo '<input type="radio" name="language" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_'. esc_attr( $language['language'] ) .'" value="' . esc_attr( $language['language'] ) . '">';
</del><ins>+ echo '<input type="radio" name="language" class="' . esc_attr( $language['language'] ) . ' screen-reader-input language-chooser-input" id="language_'. esc_attr( $language['language'] ) .'" value="' . esc_attr( $language['language'] ) . '">';
</ins><span class="cx"> echo '<label for="language_' . esc_attr( $language['language'] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
</span><span class="cx"> }
</span><span class="cx"> echo "</fieldset>\n";
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install.php (29019 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install.php 2014-07-07 22:40:33 UTC (rev 29019)
+++ trunk/src/wp-admin/install.php 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -281,5 +281,6 @@
</span><span class="cx"> <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php wp_print_scripts( 'user-profile' ); ?>
</span><ins>+<?php wp_print_scripts( 'language-chooser' ); ?>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunksrcwpadminjslanguagechooserjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-admin/js/language-chooser.js (0 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/language-chooser.js (rev 0)
+++ trunk/src/wp-admin/js/language-chooser.js 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+(function($){
+ if ( $('body').hasClass('language-chooser') === false ) {
+ return;
+ }
+
+ var mouseDown = 0,
+ $fieldset = $('fieldset');
+
+ // simple way to check if mousebutton is depressed while accounting for multiple mouse buttons being used independently
+ document.body.onmousedown = function() {
+ ++mouseDown;
+ };
+ document.body.onmouseup = function() {
+ --mouseDown;
+ };
+
+ /*
+ we can't rely upon the focusout event
+ since clicking on a label triggers it
+ */
+ function maybeRemoveFieldsetFocus(){
+ if (mouseDown) {
+ setTimeout( maybeRemoveFieldsetFocus, 50);
+ return;
+ }
+ if ( $(':focus').hasClass('language-chooser-input') !== true ) {
+ $fieldset.removeClass('focus');
+ }
+ }
+
+ $fieldset.focusin( function() {
+ $(this).addClass('focus');
+ });
+
+ $fieldset.focusout( function() {
+ setTimeout( maybeRemoveFieldsetFocus, 50);
+ });
+
+})(jQuery);
</ins></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/setup-config.php (29019 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/setup-config.php 2014-07-07 22:40:33 UTC (rev 29019)
+++ trunk/src/wp-admin/setup-config.php 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -319,5 +319,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><ins>+<?php wp_print_scripts( 'language-chooser' ); ?>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (29019 => 29020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2014-07-07 22:40:33 UTC (rev 29019)
+++ trunk/src/wp-includes/script-loader.php 2014-07-08 00:29:47 UTC (rev 29020)
</span><span class="lines">@@ -345,6 +345,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
</span><ins>+ $scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
</ins><span class="cx">
</span><span class="cx"> $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>