From 5a55add794458c07fee79f2946101257f4e9009d Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 9 Oct 2015 01:26:46 +0000 Subject: [PATCH] JS: in event callbacks replace the very outdated `return false` with `preventDefault()`. Props adamsilverstein. Fixes #18590. git-svn-id: https://develop.svn.wordpress.org/trunk@34977 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/dashboard.js | 5 ++--- src/wp-admin/js/edit-comments.js | 9 ++++++--- src/wp-admin/js/gallery.js | 20 ++++++++++---------- src/wp-admin/js/inline-edit-post.js | 4 ++-- src/wp-admin/js/plugin-install.js | 5 ++--- src/wp-admin/js/post.js | 22 +++++++++++----------- src/wp-admin/js/postbox.js | 4 ++-- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/wp-admin/js/dashboard.js b/src/wp-admin/js/dashboard.js index a2a846cdd4..fa100dd16c 100644 --- a/src/wp-admin/js/dashboard.js +++ b/src/wp-admin/js/dashboard.js @@ -67,7 +67,8 @@ jQuery(document).ready( function($) { $( '#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]' ).prop( 'disabled' , false ); - t = $('#quick-press').submit( function() { + t = $('#quick-press').submit( function( e ) { + e.preventDefault(); $('#dashboard_quick_press #publishing-action .spinner').show(); $('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').prop('disabled', true); @@ -87,8 +88,6 @@ jQuery(document).ready( function($) { latestPost.css('background', 'none'); }, 1000); } - - return false; } ); $('#publish').click( function() { act.val( 'post-quickpress-publish' ); } ); diff --git a/src/wp-admin/js/edit-comments.js b/src/wp-admin/js/edit-comments.js index 06597a83b1..23228af15f 100644 --- a/src/wp-admin/js/edit-comments.js +++ b/src/wp-admin/js/edit-comments.js @@ -284,13 +284,13 @@ setCommentsList = function() { a.attr('class', 'vim-z vim-destructive'); $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside'); - a.click(function(){ + a.click(function( e ){ + e.preventDefault(); list.wpList.del(this); $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){ $(this).remove(); $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); }); }); - return false; }); } @@ -854,7 +854,10 @@ $(document).ready(function(){ setCommentsList(); commentReply.init(); - $(document).delegate('span.delete a.delete', 'click', function(){return false;}); + + $(document).on( 'click', 'span.delete a.delete', function( e ) { + e.preventDefault(); + }); if ( typeof $.table_hotkeys != 'undefined' ) { make_hotkeys_redirect = function(which) { diff --git a/src/wp-admin/js/gallery.js b/src/wp-admin/js/gallery.js index 5b70b7f21c..e2131323ea 100644 --- a/src/wp-admin/js/gallery.js +++ b/src/wp-admin/js/gallery.js @@ -38,33 +38,33 @@ jQuery(document).ready(function($) { }); }; - $('#asc').click( function() { + $('#asc').click( function( e ) { + e.preventDefault(); desc = false; sortIt(); - return false; }); - $('#desc').click( function() { + $('#desc').click( function( e ) { + e.preventDefault(); desc = true; sortIt(); - return false; }); - $('#clear').click( function() { + $('#clear').click( function( e ) { + e.preventDefault(); clearAll(1); - return false; }); - $('#showall').click( function() { + $('#showall').click( function( e ) { + e.preventDefault(); $('#sort-buttons span a').toggle(); $('a.describe-toggle-on').hide(); $('a.describe-toggle-off, table.slidetoggle').show(); $('img.pinkynail').toggle(false); - return false; }); - $('#hideall').click( function() { + $('#hideall').click( function( e ) { + e.preventDefault(); $('#sort-buttons span a').toggle(); $('a.describe-toggle-on').show(); $('a.describe-toggle-off, table.slidetoggle').hide(); $('img.pinkynail').toggle(true); - return false; }); // initialize sortable diff --git a/src/wp-admin/js/inline-edit-post.js b/src/wp-admin/js/inline-edit-post.js index fa0bbbe717..a07e8ec9b8 100644 --- a/src/wp-admin/js/inline-edit-post.js +++ b/src/wp-admin/js/inline-edit-post.js @@ -48,9 +48,9 @@ inlineEditPost = { }); // add events - $('#the-list').on('click', 'a.editinline', function(){ + $('#the-list').on( 'click', 'a.editinline', function( e ) { + e.preventDefault(); inlineEditPost.edit(this); - return false; }); $('#bulk-edit').find('fieldset:first').after( diff --git a/src/wp-admin/js/plugin-install.js b/src/wp-admin/js/plugin-install.js index 87c27d1b61..755071d0bc 100644 --- a/src/wp-admin/js/plugin-install.js +++ b/src/wp-admin/js/plugin-install.js @@ -38,15 +38,14 @@ jQuery( document ).ready( function( $ ) { tb_position(); }); - $( '.plugin-card, .plugins .plugin-version-author-uri' ).on( 'click', 'a.thickbox', function() { + $( '.plugin-card, .plugins .plugin-version-author-uri' ).on( 'click', 'a.thickbox', function( e ) { + e.preventDefault(); tb_click.call(this); $('#TB_title').css({'background-color':'#23282d','color':'#cfcfcf'}); $('#TB_ajaxWindowTitle').html( '' + plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) ); $('#TB_iframeContent').attr( 'title', plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) ); $('#TB_closeWindowButton').focus(); - - return false; }); /* Plugin install related JS */ diff --git a/src/wp-admin/js/post.js b/src/wp-admin/js/post.js index ff92c4b894..c8404576c4 100644 --- a/src/wp-admin/js/post.js +++ b/src/wp-admin/js/post.js @@ -432,7 +432,8 @@ jQuery(document).ready( function($) { settingName = 'cats'; // TODO: move to jQuery 1.3+, support for multiple hierarchical taxonomies, see wp-lists.js - $('a', '#' + taxonomy + '-tabs').click( function(){ + $('a', '#' + taxonomy + '-tabs').click( function( e ) { + e.preventDefault(); var t = $(this).attr('href'); $(this).parent().addClass('tabs').siblings('li').removeClass('tabs'); $('#' + taxonomy + '-tabs').siblings('.tabs-panel').hide(); @@ -441,7 +442,6 @@ jQuery(document).ready( function($) { deleteUserSetting( settingName ); else setUserSetting( settingName, 'pop' ); - return false; }); if ( getUserSetting( settingName ) ) @@ -483,11 +483,11 @@ jQuery(document).ready( function($) { addAfter: catAddAfter }); - $('#' + taxonomy + '-add-toggle').click( function() { + $('#' + taxonomy + '-add-toggle').click( function( e ) { + e.preventDefault(); $('#' + taxonomy + '-adder').toggleClass( 'wp-hidden-children' ); $('a[href="#' + taxonomy + '-all"]', '#' + taxonomy + '-tabs').click(); $('#new'+taxonomy).focus(); - return false; }); $('#' + taxonomy + 'checklist, #' + taxonomy + 'checklist-pop').on( 'click', 'li.popular-category > label input[type="checkbox"]', function() { @@ -608,7 +608,8 @@ jQuery(document).ready( function($) { return true; }; - $( '#visibility .edit-visibility').click( function () { + $( '#visibility .edit-visibility').click( function( e ) { + e.preventDefault(); if ( $postVisibilitySelect.is(':hidden') ) { updateVisibility(); $postVisibilitySelect.slideDown( 'fast', function() { @@ -616,7 +617,6 @@ jQuery(document).ready( function($) { } ); $(this).hide(); } - return false; }); $postVisibilitySelect.find('.cancel-post-visibility').click( function( event ) { @@ -742,11 +742,12 @@ jQuery(document).ready( function($) { revert_e = e.html(); buttons.html(' '+postL10n.cancel+''); - buttons.children('.save').click(function() { + buttons.children('.save').click( function( e ) { var new_slug = e.children('input').val(); + e.preventDefault(); if ( new_slug == $('#editable-post-name-full').text() ) { buttons.children('.cancel').click(); - return false; + return; } $.post(ajaxurl, { action: 'sample-permalink', @@ -768,17 +769,16 @@ jQuery(document).ready( function($) { real_slug.val(new_slug); $( '.edit-slug' ).focus(); }); - return false; }); - buttons.children('.cancel').click(function() { + buttons.children('.cancel').click( function( e ) { + e.preventDefault(); $('#view-post-btn').show(); e.html(revert_e); buttons.html(buttonsOrig); permalink.html(permalinkOrig); real_slug.val(revert_slug); $( '.edit-slug' ).focus(); - return false; }); for ( i = 0; i < full.length; ++i ) { diff --git a/src/wp-admin/js/postbox.js b/src/wp-admin/js/postbox.js index 23bad8e80e..4fe74193bb 100644 --- a/src/wp-admin/js/postbox.js +++ b/src/wp-admin/js/postbox.js @@ -56,10 +56,10 @@ var postboxes; e.stopPropagation(); }); - $( '.postbox a.dismiss' ).bind( 'click.postboxes', function() { + $( '.postbox a.dismiss' ).on( 'click.postboxes', function( e ) { var hide_id = $(this).parents('.postbox').attr('id') + '-hide'; + e.preventDefault(); $( '#' + hide_id ).prop('checked', false).triggerHandler('click'); - return false; }); $('.hide-postbox-tog').bind('click.postboxes', function() {