Changeset 56652
- Timestamp:
- 09/21/2023 05:47:42 PM (17 months ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/js/_enqueues/lib/image-edit.js
r56602 r56652 241 241 $target.find( 'button' ).first().trigger( 'focus' ); 242 242 } 243 244 return false; 245 }, 246 247 /** 248 * Observes whether the popup should remain open based on focus position. 249 * 250 * @since 6.4.0 251 * 252 * @memberof imageEdit 253 * 254 * @param {HTMLElement} el The activated control element. 255 * 256 * @return {boolean} Always returns false. 257 */ 258 monitorPopup : function(el) { 259 var $el = $( el ); 260 var $parent = document.querySelector( '.imgedit-rotate-menu-container' ); 261 var $toggle = document.querySelector( '.imgedit-rotate-menu-container .imgedit-rotate' ); 262 263 setTimeout( function() { 264 var $focused = document.activeElement; 265 var $contains = $parent.contains( $focused ); 266 267 // If $focused is defined and not inside the menu container, close the popup. 268 if ( $focused && ! $contains ) { 269 if ( 'true' === $toggle.getAttribute( 'aria-expanded' ) ) { 270 imageEdit.togglePopup( $toggle ); 271 } 272 } 273 }, 100 ); 243 274 244 275 return false; -
trunk/src/wp-admin/includes/image-edit.php
r56602 r56652 64 64 <button type="button" class="imgedit-scale button" onclick="imageEdit.toggleControls(this);" aria-expanded="false" aria-controls="imgedit-scale"><?php esc_html_e( 'Scale' ); ?></button> 65 65 <div class="imgedit-rotate-menu-container"> 66 <button type="button" aria-controls="imgedit-rotate-menu" class="imgedit-rotate button" aria-expanded="false" onclick="imageEdit.togglePopup(this)" ><?php esc_html_e( 'Image Rotation' ); ?></button>66 <button type="button" aria-controls="imgedit-rotate-menu" class="imgedit-rotate button" aria-expanded="false" onclick="imageEdit.togglePopup(this)" onblur="imageEdit.monitorPopup(this)"><?php esc_html_e( 'Image Rotation' ); ?></button> 67 67 <div id="imgedit-rotate-menu" class="imgedit-popup-menu"> 68 68 <?php … … 76 76 $note_no_rotate = ''; 77 77 ?> 78 <button type="button" class="imgedit-rleft button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" ><?php esc_html_e( 'Rotate 90°left' ); ?></button>79 <button type="button" class="imgedit-rright button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" ><?php esc_html_e( 'Rotate 90°right' ); ?></button>80 <button type="button" class="imgedit-rfull button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(180, <?php echo "$post_id, '$nonce'"; ?>, this)" ><?php esc_html_e( 'Rotate 180°' ); ?></button>78 <button type="button" class="imgedit-rleft button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" onblur="imageEdit.monitorPopup(this)"><?php esc_html_e( 'Rotate 90° left' ); ?></button> 79 <button type="button" class="imgedit-rright button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" onblur="imageEdit.monitorPopup(this)"><?php esc_html_e( 'Rotate 90° right' ); ?></button> 80 <button type="button" class="imgedit-rfull button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(180, <?php echo "$post_id, '$nonce'"; ?>, this)" onblur="imageEdit.monitorPopup(this)"><?php esc_html_e( 'Rotate 180°' ); ?></button> 81 81 <?php 82 82 } else { … … 89 89 ?> 90 90 <hr /> 91 <button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button>92 <button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button>91 <button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" onblur="imageEdit.monitorPopup(this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button> 92 <button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" onblur="imageEdit.monitorPopup(this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button> 93 93 <?php echo $note_no_rotate; ?> 94 94 </div>
Note: See TracChangeset
for help on using the changeset viewer.