<!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>[24680] trunk/wp-admin: Tweaks to the accordion:</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/24680">24680</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-07-12 18:16:29 +0000 (Fri, 12 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks to the accordion:
* Enqueues JS in `do_accordion_sections()`.
* Top and bottom rounded corners for the nav menu accordion.
* Better RTL and no-JS.
props lessbloat, DrewAPicture, aaroncampbell, helen. fixes <a href="http://core.trac.wordpress.org/ticket/23449">#23449</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadminrtlcss">trunk/wp-admin/css/wp-admin-rtl.css</a></li>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminjsaccordionjs">trunk/wp-admin/js/accordion.js</a></li>
<li><a href="#trunkwpadminjsnavmenujs">trunk/wp-admin/js/nav-menu.js</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.css (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.css 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/css/wp-admin-rtl.css 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -2708,7 +2708,7 @@
</span><span class="cx"> font-family: Tahoma, Arial, sans-serif;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.accordion-section-title:after {
</del><ins>+.js .accordion-section-title:after {
</ins><span class="cx"> right: auto;
</span><span class="cx"> left: 20px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/css/wp-admin.css 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -7500,14 +7500,24 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.accordion-container .accordion-section:first-child {
</del><ins>+#nav-menu-meta .accordion-container .top {
+ border-top: 1px solid #dfdfdf;
+}
+
+#nav-menu-meta .accordion-container .accordion-section:first-child,
+#nav-menu-meta .accordion-container .accordion-section:first-child h3,
+#nav-menu-meta .accordion-container .top,
+#nav-menu-meta .accordion-container .top h3 {
</ins><span class="cx"> -webkit-border-top-right-radius: 3px;
</span><span class="cx"> -webkit-border-top-left-radius: 3px;
</span><span class="cx"> border-top-right-radius: 3px;
</span><span class="cx"> border-top-left-radius: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.accordion-container .accordion-section:last-child {
</del><ins>+#nav-menu-meta .accordion-container .accordion-section:last-child,
+#nav-menu-meta .accordion-container .accordion-section:last-child .accordion-section-content,
+#nav-menu-meta .accordion-container .bottom,
+#nav-menu-meta .accordion-container .bottom:not(.open) h3 {
</ins><span class="cx"> -webkit-border-bottom-right-radius: 3px;
</span><span class="cx"> -webkit-border-bottom-left-radius: 3px;
</span><span class="cx"> border-bottom-right-radius: 3px;
</span><span class="lines">@@ -8968,14 +8978,16 @@
</span><span class="cx"> border-left: 1px solid #dfdfdf;
</span><span class="cx"> border-right: 1px solid #dfdfdf;
</span><span class="cx">
</span><del>- cursor: pointer;
-
</del><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -moz-user-select: none;
</span><span class="cx"> user-select: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.accordion-section-title:after {
</del><ins>+.js .accordion-section-title {
+ cursor: pointer;
+}
+
+.js .accordion-section-title:after {
</ins><span class="cx"> content: '';
</span><span class="cx"> width: 0;
</span><span class="cx"> height: 0;
</span><span class="lines">@@ -9028,10 +9040,10 @@
</span><span class="cx"> border-color: #eee transparent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.control-section:hover .accordion-section-title,
-.control-section .accordion-section-title:hover,
-.control-section.open .accordion-section-title,
-.control-section .accordion-section-title:focus {
</del><ins>+.js .control-section:hover .accordion-section-title,
+.js .control-section .accordion-section-title:hover,
+.js .control-section.open .accordion-section-title,
+.js .control-section .accordion-section-title:focus {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> text-shadow: 0 -1px 0 #333;
</span><span class="cx"> background: #808080;
</span><span class="lines">@@ -9044,7 +9056,7 @@
</span><span class="cx"> border-right: 1px solid #808080;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.control-section.accordion-section:hover,
</del><ins>+.js .control-section.accordion-section:hover,
</ins><span class="cx"> .control-section.accordion-section.open {
</span><span class="cx"> border-top-color: #808080;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/includes/template.php 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -985,6 +985,8 @@
</span><span class="cx"> function do_accordion_sections( $screen, $context, $object ) {
</span><span class="cx"> global $wp_meta_boxes;
</span><span class="cx">
</span><ins>+ wp_enqueue_script( 'accordion' );
+
</ins><span class="cx"> if ( empty( $screen ) )
</span><span class="cx"> $screen = get_current_screen();
</span><span class="cx"> elseif ( is_string( $screen ) )
</span></span></pre></div>
<a id="trunkwpadminjsaccordionjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/accordion.js (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/accordion.js 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/js/accordion.js 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -1,20 +1,54 @@
</span><del>-jQuery(document).ready( function($) {
- // Expand/Collapse
- $('.accordion-container').on( 'click keydown', '.accordion-section-title', function(e) {
- if ( e.type === 'keydown' && 13 !== e.which ) // "return" key
- return;
- e.preventDefault(); // Keep this AFTER the key filter above
</del><ins>+( function( $ ){
</ins><span class="cx">
</span><del>- var section = $( this ).closest( '.accordion-section' ),
- siblings = section.siblings( '.open' ),
- content = section.find( '.accordion-section-content' );
</del><ins>+ $( document ).ready( function () {
</ins><span class="cx">
</span><del>- if ( section.hasClass('cannot-expand') )
</del><ins>+ // Expand/Collapse on click
+ $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) {
+ if ( e.type === 'keydown' && 13 !== e.which ) // "return" key
+ return;
+ e.preventDefault(); // Keep this AFTER the key filter above
+
+ accordionSwitch( $( this ) );
+ accordionCorners();
+ });
+
+ // Refresh selected accordion option when screen options are toggled
+ $( '.hide-postbox-tog' ).click( function () {
+ accordionInit();
+ });
+
+ });
+
+ var accordionOptions = $( '.accordion-container li.accordion-section' ),
+ sectionContent = $( '.accordion-section-content' );
+
+ // Rounded corners
+ function accordionCorners () {
+ accordionOptions.removeClass( 'top bottom' );
+ accordionOptions.filter( ':visible' ).first().addClass( 'top' );
+ accordionOptions.filter( ':visible' ).last().addClass( 'bottom' ).find( sectionContent ).addClass('bottom');
+ };
+
+ function accordionInit () {
+ accordionSwitch( accordionOptions.filter( ':visible' ).first() );
+ accordionCorners();
+ }
+
+ function accordionSwitch ( el ) {
+ var section = el.closest( '.accordion-section' ),
+ siblings = section.parent().find( '.open' ),
+ content = section.find( sectionContent );
+
+ if ( section.hasClass( 'cannot-expand' ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> siblings.removeClass( 'open' );
</span><del>- siblings.find( '.accordion-section-content' ).show().slideUp( 150 );
</del><ins>+ siblings.find( sectionContent ).show().slideUp( 150 );
</ins><span class="cx"> content.toggle( section.hasClass( 'open' ) ).slideToggle( 150 );
</span><span class="cx"> section.toggleClass( 'open' );
</span><del>- });
-});
</del><ins>+ }
+
+ // Show the first accordion option by default
+ accordionInit();
+
+})(jQuery);
</ins></span></pre></div>
<a id="trunkwpadminjsnavmenujs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.js (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.js 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/js/nav-menu.js 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -53,9 +53,6 @@
</span><span class="cx"> this.initAccessibility();
</span><span class="cx">
</span><span class="cx"> this.initToggles();
</span><del>-
- // Open first accordion option
- this.initAccordion();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> jQueryExtensions : function() {
</span><span class="lines">@@ -267,12 +264,6 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><del>- initAccordion : function() {
- var accordionOptions = $( '.accordion-container li.accordion-section' );
- accordionOptions.removeClass('open');
- accordionOptions.filter(':visible').first().addClass( 'open' );
- },
-
</del><span class="cx"> countMenuItems : function( depth ) {
</span><span class="cx"> return $( '.menu-item-depth-' + depth ).length;
</span><span class="cx"> },
</span><span class="lines">@@ -544,8 +535,6 @@
</span><span class="cx"> api.menuList.hideAdvancedMenuItemFields();
</span><span class="cx">
</span><span class="cx"> $('.hide-postbox-tog').click(function () {
</span><del>- api.initAccordion();
-
</del><span class="cx"> var hidden = $( '.accordion-container li.accordion-section' ).filter(':hidden').map(function() { return this.id; }).get().join(',');
</span><span class="cx"> $.post(ajaxurl, {
</span><span class="cx"> action: 'closed-postboxes',
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (24679 => 24680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2013-07-12 18:14:23 UTC (rev 24679)
+++ trunk/wp-admin/nav-menus.php 2013-07-12 18:16:29 UTC (rev 24680)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> wp_die( __( 'Cheatin’ uh?' ) );
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'nav-menu' );
</span><del>-wp_enqueue_script( 'accordion' );
</del><span class="cx">
</span><span class="cx"> if ( wp_is_mobile() )
</span><span class="cx"> wp_enqueue_script( 'jquery-touch-punch' );
</span></span></pre>
</div>
</div>
</body>
</html>