<!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>[33153] trunk/src: Customizer: Use a `<button>` for the collapse sidebar ?\226?\128?\166 button.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33153">33153</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33153","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-10 21:21:07 +0000 (Fri, 10 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Use a `<button>` for the collapse sidebar ?\226?\128?\166 button.
props afercia.
fixes <a href="https://core.trac.wordpress.org/ticket/32819">#32819</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincsscustomizenavmenuscss">trunk/src/wp-admin/css/customize-nav-menus.css</a></li>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/css/customize-controls.css 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,26 +648,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-right: 1px solid #ddd;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.collapse-sidebar {
- background-color: transparent !important;
- border: none !important;
- -webkit-box-shadow: none !important;
- box-shadow: none !important;
- -webkit-border-radius: 0 !important;
- border-radius: 0 !important;
-}
-
-
-.collapse-sidebar:active,
-.collapse-sidebar:active .collapse-sidebar-label,
-.collapse-sidebar:active .collapse-sidebar-arrow:before {
- text-shadow: none;
-}
-
-.collapsed .collapse-sidebar-arrow:before {
- color: #82878c;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Style for custom settings */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="trunksrcwpadmincsscustomizenavmenuscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-nav-menus.css 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/css/customize-nav-menus.css 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,13 +379,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/* Not exactly sure what broke this, or why it works without these styles in core. */
-.wp-customizer .wp-full-overlay a.collapse-sidebar {
- position: fixed;
- left: 0;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* WARNING: The 20px factor is hard-coded in JS. */
</span><span class="cx" style="display: block; padding: 0 10px"> .menu-item-depth-0 { margin-left: 0; }
</span><span class="cx" style="display: block; padding: 0 10px"> .menu-item-depth-1 { margin-left: 20px; }
</span></span></pre></div>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/css/themes.css 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,8 +512,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f345";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
</del><span class="cx" style="display: block; padding: 0 10px"> .theme-overlay .theme-wrap {
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> position: fixed;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1470,65 +1468,78 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Collapse Button */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-full-overlay a.collapse-sidebar {
- position: absolute;
- bottom: 12px;
- left: 0;
- z-index: 50;
- display: block;
- width: 19px;
- height: 19px;
- margin-left: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .wp-full-overlay .collapse-sidebar {
+ position: fixed;
+ bottom: 8px;
+ left: 10px;
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -webkit-border-radius: 50%;
- border-radius: 50%;
- color: #777;
- text-decoration: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #656a6f;
+ outline: 0;
+ line-height: 1;
+ background-color: transparent !important;
+ border: none !important;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ -webkit-border-radius: 0 !important;
+ border-radius: 0 !important;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-full-overlay a.collapse-sidebar:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
+.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #0073aa;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-full-overlay.collapsed .collapse-sidebar {
- position: absolute;
- left: 100%;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-full-overlay .collapse-sidebar-arrow,
+.wp-full-overlay .collapse-sidebar-label {
+ display: inline-block;
+ vertical-align: middle;
+ line-height: 20px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay .collapse-sidebar-arrow {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- position: static;
- margin-top: 0;
- margin-left: 0;
- display: block;
- width: auto;
- height: auto;
- background: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 20px;
+ height: 20px;
+ margin: 0 2px; /* avoid the focus box-shadow to be cut-off */
+ -webkit-border-radius: 50%;
+ border-radius: 50%;
+ overflow: hidden;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-full-overlay .collapse-sidebar:hover .collapse-sidebar-arrow,
+.wp-full-overlay .collapse-sidebar:focus .collapse-sidebar-arrow {
+ -webkit-box-shadow:
+ 0 0 0 1px #5b9dd9,
+ 0 0 2px 1px rgba(30, 140, 190, .8);
+ box-shadow:
+ 0 0 0 1px #5b9dd9,
+ 0 0 2px 1px rgba(30, 140, 190, .8);
+}
+
+.wp-full-overlay .collapse-sidebar-label {
+ margin-left: 3px;
+}
+
+.wp-full-overlay.collapsed .collapse-sidebar-label {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay .collapse-sidebar-arrow:before {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -webkit-border-radius: 50%;
- border-radius: 50%;
- float: left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: block;
</ins><span class="cx" style="display: block; padding: 0 10px"> content: "\f148";
</span><span class="cx" style="display: block; padding: 0 10px"> background: #eee;
</span><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 'dashicons';
</span><span class="cx" style="display: block; padding: 0 10px"> speak: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display: block;
</del><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-indent: 0;
- text-align: center;
- position: relative;
</del><span class="cx" style="display: block; padding: 0 10px"> -webkit-font-smoothing: antialiased;
</span><span class="cx" style="display: block; padding: 0 10px"> -moz-osx-font-smoothing: grayscale;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-decoration: none !important;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* rtl:ignore */
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay.collapsed .collapse-sidebar-arrow:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .rtl .wp-full-overlay .collapse-sidebar-arrow:before {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -webkit-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- transform: rotate(180deg);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-transform: rotate(180.001deg);
+ -ms-transform: rotate(180.001deg);
+ transform: rotate(180.001deg); /* Firefox: promoting to its own layer to trigger anti-aliasing */
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1537,21 +1548,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-full-overlay.collapsed .collapse-sidebar-arrow {
- background-position: -1px -109px;
-}
-
-.wp-full-overlay .collapse-sidebar-label {
- position: absolute;
- left: 100%;
- line-height: 20px;
- margin-left: 10px;
-}
-
-.wp-full-overlay.collapsed .collapse-sidebar-label {
- display: none;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Animations */
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-full-overlay-sidebar,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1612,10 +1608,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transition: opacity 0.3s;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-container .collapse-sidebar {
- bottom: 16px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #customize-controls {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/customize.php 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,10 +166,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="customize-footer-actions" class="wp-full-overlay-footer">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="collapse-sidebar-arrow"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
- </a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="customize-preview" class="wp-full-overlay-main"></div>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,10 +328,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="install-theme-info"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-footer">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" class="collapse-sidebar" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
- <span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="collapse-sidebar-arrow"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-main"></div>
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3086,13 +3086,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.collapse-sidebar').on( 'click keydown', function( event ) {
- if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.collapse-sidebar' ).on( 'click', function() {
+ if ( 'true' === $( this ).attr( 'aria-expanded' ) ) {
+ $( this ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar });
+ } else {
+ $( this ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- event.preventDefault();
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.customize-controls-preview-toggle' ).on( 'click keydown', function( event ) {
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/js/theme.js 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +793,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- collapse: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ collapse: function( event ) {
+ var $button = $( event.currentTarget );
+ if ( 'true' === $button.attr( 'aria-expanded' ) ) {
+ $button.attr({ 'aria-expanded': 'false', 'aria-label': l10n.expandSidebar });
+ } else {
+ $button.attr({ 'aria-expanded': 'true', 'aria-label': l10n.collapseSidebar });
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-admin/theme-install.php 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themesFound' => __( 'Number of Themes found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noThemesFound' => __( 'No themes found. Try a different search.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'collapseSidebar' => __( 'Collapse Sidebar' ),
+ 'expandSidebar' => __( 'Expand Sidebar' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'installedThemes' => array_keys( $installed_themes ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,10 +254,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-footer">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" class="collapse-sidebar" title="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+ <span class="collapse-sidebar-arrow"></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="collapse-sidebar-arrow"></span>
- </a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-main">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-07-09 22:08:44 UTC (rev 33152)
+++ trunk/src/wp-includes/script-loader.php 2015-07-10 21:21:07 UTC (rev 33153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,9 +419,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'cheatin' => __( 'Cheatin’ uh?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'previewIframeTitle' => __( 'Site Preview' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'loginIframeTitle' => __( 'Session expired' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'collapseSidebar' => __( 'Collapse Sidebar' ),
+ 'expandSidebar' => __( 'Expand Sidebar' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // Used for overriding the file types allowed in plupload.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'allowedFiles' => __( 'Allowed Files' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'allowedFiles' => __( 'Allowed Files' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>