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 #33754.


git-svn-id: https://develop.svn.wordpress.org/trunk@34893 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-10-07 01:57:06 +00:00
parent b7c01dc018
commit dae3ea83cb
4 changed files with 85 additions and 51 deletions
+62 -33
View File
@@ -6,34 +6,51 @@ var postboxes;
var $document = $( document );
postboxes = {
add_postbox_toggles : function(page, args) {
var self = this;
handle_click : function () {
var $el = $( this ),
p = $el.parent( '.postbox' ),
id = p.attr( 'id' ),
ariaExpandedValue;
self.init(page, args);
if ( 'dashboard_browser_nag' === id ) {
return;
}
$('.postbox .hndle, .postbox .handlediv').bind('click.postboxes', function( e ) {
var p = $(this).parent('.postbox'), id = p.attr('id');
p.toggleClass( 'closed' );
if ( 'dashboard_browser_nag' == id )
return;
ariaExpandedValue = ! p.hasClass( 'closed' );
e.preventDefault();
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 );
}
p.toggleClass( 'closed' );
$(this).attr( 'aria-expanded', ! p.hasClass( 'closed' ) );
if ( postboxes.page !== 'press-this' ) {
postboxes.save_state( postboxes.page );
}
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);
if ( id ) {
if ( !p.hasClass('closed') && $.isFunction( postboxes.pbshow ) ) {
postboxes.pbshow( id );
} else if ( p.hasClass('closed') && $.isFunction( postboxes.pbhide ) ) {
postboxes.pbhide( id );
}
}
$document.trigger( 'postbox-toggled', p );
});
$document.trigger( 'postbox-toggled', p );
},
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 );
$('.postbox .hndle a').click( function(e) {
e.stopPropagation();
@@ -46,20 +63,23 @@ var postboxes;
});
$('.hide-postbox-tog').bind('click.postboxes', function() {
var boxId = $(this).val(),
var $el = $(this),
boxId = $el.val(),
$postbox = $( '#' + boxId );
if ( $(this).prop('checked') ) {
if ( $el.prop( 'checked' ) ) {
$postbox.show();
if ( $.isFunction( postboxes.pbshow ) )
self.pbshow( boxId );
if ( $.isFunction( postboxes.pbshow ) ) {
postboxes.pbshow( boxId );
}
} else {
$postbox.hide();
if ( $.isFunction( postboxes.pbhide ) )
self.pbhide( boxId );
if ( $.isFunction( postboxes.pbhide ) ) {
postboxes.pbhide( boxId );
}
}
self.save_state(page);
self._mark_area();
postboxes.save_state( page );
postboxes._mark_area();
$document.trigger( 'postbox-toggled', $postbox );
});
@@ -67,14 +87,15 @@ var postboxes;
var n = parseInt($(this).val(), 10);
if ( n ) {
self._pb_edit(n);
self.save_order(page);
postboxes._pb_edit(n);
postboxes.save_order( page );
}
});
},
init : function(page, args) {
var isMobile = $(document.body).hasClass('mobile');
var isMobile = $( document.body ).hasClass( 'mobile' ),
$handleButtons = $( '.postbox .handlediv' );
$.extend( this, args || {} );
$('#wpbody-content').css('overflow','hidden');
@@ -91,8 +112,10 @@ var postboxes;
helper: 'clone',
opacity: 0.65,
stop: function() {
if ( $(this).find('#dashboard_browser_nag').is(':visible') && 'dashboard_browser_nag' != this.firstChild.id ) {
$(this).sortable('cancel');
var $el = $( this );
if ( $el.find( '#dashboard_browser_nag' ).is( ':visible' ) && 'dashboard_browser_nag' != this.firstChild.id ) {
$el.sortable('cancel');
return;
}
@@ -112,6 +135,12 @@ var postboxes;
}
this._mark_area();
// 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' ) );
});
},
save_state : function(page) {