diff --git a/src/js/_enqueues/admin/user-profile.js b/src/js/_enqueues/admin/user-profile.js index 7fa3064400..ec76df9c7f 100644 --- a/src/js/_enqueues/admin/user-profile.js +++ b/src/js/_enqueues/admin/user-profile.js @@ -17,19 +17,7 @@ $toggleButton, $submitButtons, $submitButton, - currentPass, - inputEvent; - - /* - * Use feature detection to determine whether password inputs should use - * the `keyup` or `input` event. Input is preferred but lacks support - * in legacy browsers. - */ - if ( 'oninput' in document.createElement( 'input' ) ) { - inputEvent = 'input'; - } else { - inputEvent = 'keyup'; - } + currentPass; function generatePassword() { if ( typeof zxcvbn !== 'function' ) { @@ -71,7 +59,7 @@ .addClass( $pass1[0].className ) .data( 'pw', $pass1.data( 'pw' ) ) .val( $pass1.val() ) - .on( inputEvent, function () { + .on( 'input', function () { if ( $pass1Text.val() === currentPass ) { return; } @@ -86,7 +74,7 @@ generatePassword(); } - $pass1.on( inputEvent + ' pwupdate', function () { + $pass1.on( 'input' + ' pwupdate', function () { if ( $pass1.val() === currentPass ) { return; } @@ -188,7 +176,7 @@ * This fixes the issue by copying any changes from the hidden * pass2 field to the pass1 field, then running check_pass_strength. */ - $pass2 = $('#pass2').on( inputEvent, function () { + $pass2 = $( '#pass2' ).on( 'input', function () { if ( $pass2.val().length > 0 ) { $pass1.val( $pass2.val() ); $pass2.val(''); @@ -336,7 +324,7 @@ current_name = select.val(), greeting = $( '#wp-admin-bar-my-account' ).find( '.display-name' ); - $('#pass1').val('').on( inputEvent + ' pwupdate', check_pass_strength ); + $( '#pass1' ).val( '' ).on( 'input' + ' pwupdate', check_pass_strength ); $('#pass-strength-result').show(); $('.color-palette').click( function() { $(this).siblings('input[name="admin_color"]').prop('checked', true); diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index 40f6787c76..bed4216595 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -873,26 +873,14 @@ }, attachQuickSearchListeners : function() { - var searchTimer, - inputEvent; + var searchTimer; // Prevent form submission. $( '#nav-menu-meta' ).on( 'submit', function( event ) { event.preventDefault(); }); - /* - * Use feature detection to determine whether inputs should use - * the `keyup` or `input` event. Input is preferred but lacks support - * in legacy browsers. See changeset 34078, see also ticket #26600#comment:59 - */ - if ( 'oninput' in document.createElement( 'input' ) ) { - inputEvent = 'input'; - } else { - inputEvent = 'keyup'; - } - - $( '#nav-menu-meta' ).on( inputEvent, '.quick-search', function() { + $( '#nav-menu-meta' ).on( 'input', '.quick-search', function() { var $this = $( this ); $this.attr( 'autocomplete', 'off' ); diff --git a/src/js/_enqueues/wp/customize/nav-menus.js b/src/js/_enqueues/wp/customize/nav-menus.js index 2addf27562..b6560366c1 100644 --- a/src/js/_enqueues/wp/customize/nav-menus.js +++ b/src/js/_enqueues/wp/customize/nav-menus.js @@ -156,7 +156,6 @@ events: { 'input #menu-items-search': 'debounceSearch', - 'keyup #menu-items-search': 'debounceSearch', 'focus .menu-item-tpl': 'focus', 'click .menu-item-tpl': '_submit', 'click #custom-menu-item-submit': '_submitLink', diff --git a/src/js/_enqueues/wp/customize/widgets.js b/src/js/_enqueues/wp/customize/widgets.js index 20659b1cac..d84d672c15 100644 --- a/src/js/_enqueues/wp/customize/widgets.js +++ b/src/js/_enqueues/wp/customize/widgets.js @@ -144,7 +144,6 @@ events: { 'input #widgets-search': 'search', - 'keyup #widgets-search': 'search', 'focus .widget-tpl' : 'focus', 'click .widget-tpl' : '_submit', 'keypress .widget-tpl' : '_submit',