From b2b3f1c3ff06f3b32c33c5241a51de08f60ea086 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Tue, 16 Jun 2015 22:18:24 +0000 Subject: [PATCH] Twenty Fifteen: Wrap navigation helpers into a function so it can be called on a refresh event of the Customize Preview. props westonruter. see #32576. Built from https://develop.svn.wordpress.org/trunk@32807 git-svn-id: http://core.svn.wordpress.org/trunk@32778 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentyfifteen/js/functions.js | 33 +++++++++++-------- wp-includes/version.php | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/wp-content/themes/twentyfifteen/js/functions.js b/wp-content/themes/twentyfifteen/js/functions.js index eeeecd2246..64a696860d 100644 --- a/wp-content/themes/twentyfifteen/js/functions.js +++ b/wp-content/themes/twentyfifteen/js/functions.js @@ -9,23 +9,28 @@ var $body, $window, $sidebar, adminbarOffset, top = false, bottom = false, windowWidth, windowHeight, lastWindowPos = 0, topOffset = 0, bodyHeight, sidebarHeight, resizeTimer, - secondary, button; + secondary, button; - // Add dropdown toggle that display child menu items. - $( '.main-navigation .menu-item-has-children > a' ).after( '' ); - // Toggle buttons and submenu items with active children menu items. - $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' ); - $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' ); + function initMainNavigation() { + // Add dropdown toggle that display child menu items. + $( '.main-navigation .menu-item-has-children > a' ).after( '' ); - $( '.dropdown-toggle' ).click( function( e ) { - var _this = $( this ); - e.preventDefault(); - _this.toggleClass( 'toggle-on' ); - _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' ); - _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' ); - _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand ); - } ); + // Toggle buttons and submenu items with active children menu items. + $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' ); + $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' ); + + $( '.dropdown-toggle' ).click( function( e ) { + var _this = $( this ); + e.preventDefault(); + _this.toggleClass( 'toggle-on' ); + _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' ); + _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' ); + _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand ); + } ); + } + initMainNavigation(); + $( document ).on( 'customize-preview-menu-refreshed', initMainNavigation ); secondary = $( '#secondary' ); button = $( '.site-branding' ).find( '.secondary-toggle' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 2b81aa1fa6..a2412275dd 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32806'; +$wp_version = '4.3-alpha-32807'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.