Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-10 18:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Editor: fix exiting DFW with the keyboard shortcut on Mac (Opt+Ctrl+W).

Browse Source 
Fixes #36222.
Built from https://develop.svn.wordpress.org/trunk@37003


git-svn-id: http://core.svn.wordpress.org/trunk@36970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-03-16 02:48:25 +00:00
parent effedfdff4
commit d529800cba
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/js/editor-expand.js
View File

@ -887,10 +887,15 @@
} }
function fadeOut( event ) { function fadeOut( event ) {
var key = event && event.keyCode; var isMac,
key = event && event.keyCode;
// fadeIn and return on Escape and keyboard shortcut Alt+Shift+W. if ( window.navigator.platform ) {
if ( key === 27 || ( key === 87 && event.altKey && event.shiftKey ) ) { isMac = ( window.navigator.platform.indexOf( 'Mac' ) > -1 );
}
// fadeIn and return on Escape and keyboard shortcut Alt+Shift+W and Ctrl+Opt+W.
if ( key === 27 || ( key === 87 && event.altKey && ( ( ! isMac && event.shiftKey ) || ( isMac && event.ctrlKey ) ) ) ) {
fadeIn( event ); fadeIn( event );
return; return;
} }

2
wp-admin/js/editor-expand.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.5-beta3-37002'; $wp_version = '4.5-beta3-37003';
/** /**
* 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.