<!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>[34893] trunk/src/wp-admin: Meta Boxes: reboot some of the code in `postbox.js` to support `aria-expanded` attribute toggling and to properly reference static class properties.</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/34893">34893</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/34893","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-07 01:57:06 +0000 (Wed, 07 Oct 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'>Meta Boxes: reboot some of the code in `postbox.js` to support `aria-expanded` attribute toggling and to properly reference static class properties.
Props afercia, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/33754">#33754</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincsswidgetscss">trunk/src/wp-admin/css/widgets.css</a></li>
<li><a href="#trunksrcwpadminincludestemplatefunctionsphp">trunk/src/wp-admin/includes/template-functions.php</a></li>
<li><a href="#trunksrcwpadminjspostboxjs">trunk/src/wp-admin/js/postbox.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></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/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-10-07 01:39:27 UTC (rev 34892)
+++ trunk/src/wp-admin/css/common.css 2015-10-07 01:57:06 UTC (rev 34893)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1831,13 +1831,15 @@
</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"> .postbox .handlediv {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 33px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 36px;
</ins><span class="cx" style="display: block; padding: 0 10px"> height: 36px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0;
</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"> .js .postbox .handlediv {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cursor: pointer;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .sortable-placeholder {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2770,19 +2772,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Metabox collapse arrow indicators */
</span><span class="cx" style="display: block; padding: 0 10px"> .js .sidebar-name .sidebar-name-arrow:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.js .meta-box-sortables .postbox .handlediv:before {
- right: 12px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.js .meta-box-sortables .postbox .toggle-indicator:before {
+ position: relative;
+ left: -1px; /* fix the dashicon horizontal alignment */
+ display: inline-block;
</ins><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: inline-block;
- padding: 8px 10px;
- top: 0;
- position: relative;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 8px;
</ins><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><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none !important;
</span><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">+.js .sidebar-name .sidebar-name-arrow:before {
+ padding: 10px;
+ left: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .js #widgets-left .sidebar-name .sidebar-name-arrow {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2794,12 +2800,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Show the arrow only on hover */
</span><span class="cx" style="display: block; padding: 0 10px"> .js .sidebar-name .sidebar-name-arrow:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.js .meta-box-sortables .postbox .handlediv:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.js .meta-box-sortables .postbox .toggle-indicator:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: "\f142";
</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"> .js .widgets-holder-wrap.closed .sidebar-name-arrow:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.js .meta-box-sortables .postbox.closed .handlediv:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: "\f140";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2925,6 +2931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .widget-action:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .handlediv:hover,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.handlediv:focus,
</ins><span class="cx" style="display: block; padding: 0 10px"> .item-edit:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .sidebar-name:hover .sidebar-name-arrow,
</span><span class="cx" style="display: block; padding: 0 10px"> .accordion-section-title:hover:after {
</span></span></pre></div>
<a id="trunksrcwpadmincsswidgetscss"></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/widgets.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/widgets.css 2015-10-07 01:39:27 UTC (rev 34892)
+++ trunk/src/wp-admin/css/widgets.css 2015-10-07 01:57:06 UTC (rev 34893)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,10 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0 10px 0 0;
</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">-div#widgets-left .sidebar-name .sidebar-name-arrow:before {
- right: 0;
- top: 4px;
- padding: 4px 6px 4px 4px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#widgets-left .sidebar-name .sidebar-name-arrow:before {
+ padding: 9px;
</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"> #widgets-left #available-widgets,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,8 +248,7 @@
</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"> div#widgets-right .sidebar-name .sidebar-name-arrow:before {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- right: 0;
- top: 4px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: 2px;
</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"> div#widgets-right .widget-top {
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatefunctionsphp"></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/template-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template-functions.php 2015-10-07 01:39:27 UTC (rev 34892)
+++ trunk/src/wp-admin/includes/template-functions.php 2015-10-07 01:57:06 UTC (rev 34893)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -989,8 +989,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'dashboard_browser_nag' != $box['id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<button class="handlediv button-link" title="' . esc_attr__( 'Click to toggle' ) . '" aria-expanded="true">';
- echo '<span class="screen-reader-text">' . sprintf( __( 'Click to toggle %s panel' ), $box['title'] ) . '</span><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<button type="button" class="handlediv button-link" aria-expanded="true">';
+ echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $box['title'] ) . '</span>';
+ echo '<span class="toggle-indicator" aria-hidden="true"></span>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</button>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
</span></span></pre></div>
<a id="trunksrcwpadminjspostboxjs"></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/postbox.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/postbox.js 2015-10-07 01:39:27 UTC (rev 34892)
+++ trunk/src/wp-admin/js/postbox.js 2015-10-07 01:57:06 UTC (rev 34893)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,35 +6,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var $document = $( document );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> postboxes = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_postbox_toggles : function(page, args) {
- var self = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ handle_click : function () {
+ var $el = $( this ),
+ p = $el.parent( '.postbox' ),
+ id = p.attr( 'id' ),
+ ariaExpandedValue;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.init(page, args);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dashboard_browser_nag' === id ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('.postbox .hndle, .postbox .handlediv').bind('click.postboxes', function( e ) {
- var p = $(this).parent('.postbox'), id = p.attr('id');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ p.toggleClass( 'closed' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'dashboard_browser_nag' == id )
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ariaExpandedValue = ! p.hasClass( 'closed' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- e.preventDefault();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $el.hasClass( 'handlediv' ) ) {
+ // The handle button was clicked.
+ $el.attr( 'aria-expanded', ariaExpandedValue );
+ } else {
+ // The handle heading was clicked.
+ $el.closest( '.postbox' ).find( 'button.handlediv' )
+ .attr( 'aria-expanded', ariaExpandedValue );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- p.toggleClass( 'closed' );
- $(this).attr( 'aria-expanded', ! p.hasClass( 'closed' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( postboxes.page !== 'press-this' ) {
+ postboxes.save_state( postboxes.page );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( page != 'press-this' )
- self.save_state(page);
-
- if ( id ) {
- if ( !p.hasClass('closed') && $.isFunction(postboxes.pbshow) )
- self.pbshow(id);
- else if ( p.hasClass('closed') && $.isFunction(postboxes.pbhide) )
- self.pbhide(id);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( id ) {
+ if ( !p.hasClass('closed') && $.isFunction( postboxes.pbshow ) ) {
+ postboxes.pbshow( id );
+ } else if ( p.hasClass('closed') && $.isFunction( postboxes.pbhide ) ) {
+ postboxes.pbhide( id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $document.trigger( 'postbox-toggled', p );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.trigger( 'postbox-toggled', p );
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_postbox_toggles : function (page, args) {
+ var $handles = $( '.postbox .hndle, .postbox .handlediv' );
+
+ this.page = page;
+ this.init( page, args );
+
+ $handles.on( 'click.postboxes', this.handle_click );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $('.postbox .hndle a').click( function(e) {
</span><span class="cx" style="display: block; padding: 0 10px"> e.stopPropagation();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,20 +63,23 @@
</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"> $('.hide-postbox-tog').bind('click.postboxes', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var boxId = $(this).val(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $el = $(this),
+ boxId = $el.val(),
</ins><span class="cx" style="display: block; padding: 0 10px"> $postbox = $( '#' + boxId );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $(this).prop('checked') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $el.prop( 'checked' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $postbox.show();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction( postboxes.pbshow ) )
- self.pbshow( boxId );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( postboxes.pbshow ) ) {
+ postboxes.pbshow( boxId );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $postbox.hide();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction( postboxes.pbhide ) )
- self.pbhide( boxId );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( postboxes.pbhide ) ) {
+ postboxes.pbhide( boxId );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self.save_state(page);
- self._mark_area();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ postboxes.save_state( page );
+ postboxes._mark_area();
</ins><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'postbox-toggled', $postbox );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,14 +87,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var n = parseInt($(this).val(), 10);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( n ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self._pb_edit(n);
- self.save_order(page);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ postboxes._pb_edit(n);
+ postboxes.save_order( page );
</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"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> init : function(page, args) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var isMobile = $(document.body).hasClass('mobile');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var isMobile = $( document.body ).hasClass( 'mobile' ),
+ $handleButtons = $( '.postbox .handlediv' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.extend( this, args || {} );
</span><span class="cx" style="display: block; padding: 0 10px"> $('#wpbody-content').css('overflow','hidden');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,8 +112,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> helper: 'clone',
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0.65,
</span><span class="cx" style="display: block; padding: 0 10px"> stop: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
- $(this).sortable('cancel');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $el = $( this );
+
+ if ( $el.find( '#dashboard_browser_nag' ).is( ':visible' ) && 'dashboard_browser_nag' != this.firstChild.id ) {
+ $el.sortable('cancel');
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,6 +135,12 @@
</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"> this._mark_area();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Set the handle buttons `aria-expanded` attribute initial value on page load.
+ $handleButtons.each( function () {
+ var $el = $( this );
+ $el.attr( 'aria-expanded', ! $el.parent( '.postbox' ).hasClass( 'closed' ) );
+ });
</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"> save_state : function(page) {
</span></span></pre>
</div>
</div>
</body>
</html>