Changeset 23856

Timestamp:

03/29/2013 08:28:58 AM (14 years ago)

Author:

markjaquith

Message:

Use jQuery.on() properly in accordion code. Some other cleanup.

see #23890.

File:

• trunk/wp-admin/js/accordion.js (modified) (1 diff)

trunk/wp-admin/js/accordion.js

@@ -1 +1 @@
 jQuery(document).ready( function($) {
         // Expand/Collapse
-        $('.accordion-section-title').on('click keydown', function( event ) {
+        $('.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
 
-                if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                return;
+                var section = $( this ).closest( '.accordion-section' );
 
-                var clicked = $( this ).closest( '.accordion-section' );
-
-                if ( clicked.hasClass('cannot-expand') )
+                if ( section.hasClass('cannot-expand') )
                         return;
 
-                clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
-                clicked.toggleClass( 'open' );
-                event.preventDefault();
+                section.closest( '.accordion-container' ).find( '.accordion-section' ).not( section ).removeClass( 'open' );
+                section.toggleClass( 'open' );
         });
 });