Ticket #28577: 28577.2.diff

src/wp-admin/css/install.css

@@ -337 +337 @@
         height: 250px;
 }
 
-/* TODO:add focus style via JS */
 .language-chooser fieldset.focus {
         border-color: #5b9dd9;
         -webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
@@ -355 +354 @@
 
 .language-chooser input:checked + label{
           color:white;
+          background: #777;
+}
+
+.language-chooser .focus input:checked + label{
           background: #0074A2;
 }
 
+.language-chooser label:hover {
+          background: #eee;
+}
+
 .language-chooser label{
         display:block;
 }

src/wp-admin/includes/upgrade.php

@@ -2162 +2162 @@
 function wp_install_language_form( $body ) {
         echo "<fieldset>\n";
         echo "<legend class='screen-reader-text'>Select a default language</legend>\n";
-        echo '<input type="radio" checked="checked" class="screen-reader-input" name="language" id="language_default" value="">';
+        echo '<input type="radio" checked="checked" class="screen-reader-input language-chooser-input" name="language" id="language_default" value="">';
         echo '<label for="language_default">English (United States)</label>';
         echo "\n";
 
@@ -2169 +2169 @@
         if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && ( 'en_US' !== WPLANG ) ) {
                 if ( isset( $body['languages'][WPLANG] ) ) {
                         $language = $body['languages'][WPLANG];
-                        echo '<input type="radio" name="language" checked="checked" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_wplang" value="' . esc_attr( $language['language'] ) . '">';
+                        echo '<input type="radio" name="language" checked="checked" class="' . esc_attr( $language['language'] ) . ' screen-reader-input language-chooser-input" id="language_wplang" value="' . esc_attr( $language['language'] ) . '">';
                         echo '<label for="language_wplang">' . esc_html( $language['native_name'] ) . "</label>\n";
                 }
         }
 
         foreach ( $body['languages'] as $language ) {
-                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'] ) . '">';
+                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'] ) . '">';
                 echo '<label for="language_' . esc_attr( $language['language'] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
         }
         echo "</fieldset>\n";

src/wp-admin/install.php

@@ -281 +281 @@
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 <?php } ?>
 <?php wp_print_scripts( 'user-profile' ); ?>
+<?php wp_print_scripts( 'language-chooser' ); ?>
 </body>
 </html>

src/wp-admin/js/language-chooser.js

@@ +1 @@
+(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);

src/wp-admin/setup-config.php

@@ -317 +317 @@
         break;
 }
 ?>
+<?php wp_print_scripts( 'language-chooser' ); ?>
 </body>
 </html>

src/wp-includes/script-loader.php

@@ -345 +345 @@
         ) );
 
         $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
+        $scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
 
         $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );