WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customize: Ensure Close button actually closes customizer (instead of going back) after switching to a different theme inside a `customize-loader` iframe. 

Fixes #38833.

Built from https://develop.svn.wordpress.org/trunk@39271


git-svn-id: http://core.svn.wordpress.org/trunk@39211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2016-11-16 22:17:29 +00:00
parent 4664f80711
commit c2bc6df69a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/js/customize-controls.js
View File

@ -1450,7 +1450,7 @@
request = api.requestChangesetUpdate(); request = api.requestChangesetUpdate();
request.done( function() { request.done( function() {
$( window ).off( 'beforeunload.customize-confirm' ); $( window ).off( 'beforeunload.customize-confirm' );
window.location.href = urlParser.href; top.location.href = urlParser.href;
} ); } );
request.fail( function() { request.fail( function() {
overlay.removeClass( 'customize-loading' ); overlay.removeClass( 'customize-loading' );

2
wp-admin/js/customize-controls.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta4-39270'; $wp_version = '4.7-beta4-39271';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.