From 29725ce4268275a4cfbf1959f7d07038d45cd5df Mon Sep 17 00:00:00 2001 From: wonderboymusic Date: Mon, 24 Feb 2014 20:48:02 +0000 Subject: [PATCH] Remove a few unnecessary jQuery selectors added in [27239]. Playlists don't exist in some older contexts that galleries do. See #26631. git-svn-id: https://develop.svn.wordpress.org/trunk@27243 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/plupload/handlers.js | 12 ++++++------ src/wp-includes/js/swfupload/handlers.js | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/wp-includes/js/plupload/handlers.js b/src/wp-includes/js/plupload/handlers.js index 4378848a14..7290013b56 100644 --- a/src/wp-includes/js/plupload/handlers.js +++ b/src/wp-includes/js/plupload/handlers.js @@ -22,7 +22,7 @@ function fileQueued(fileObj) { .appendTo( jQuery('#media-items' ) ); // Disable submit - jQuery('#insert-gallery, #insert-playlist').prop('disabled', true); + jQuery('#insert-gallery').prop('disabled', true); } function uploadStart() { @@ -47,7 +47,7 @@ function fileUploading(up, file) { if ( max > hundredmb && file.size > hundredmb ) { setTimeout(function(){ - + if ( file.status < 3 && file.loaded === 0 ) { // not uploading wpFileError(file, pluploadL10n.big_upload_failed.replace('%1$s', '').replace('%2$s', '')); up.stop(); // stops the whole queue @@ -64,11 +64,11 @@ function updateMediaForm() { // Just one file, no need for collapsible part if ( items.length == 1 ) { items.addClass('open').find('.slidetoggle').show(); - jQuery('.insert-gallery, .insert-playlist').hide(); + jQuery('.insert-gallery').hide(); } else if ( items.length > 1 ) { items.removeClass('open'); // Only show Gallery/Playlist buttons when there are at least two files. - jQuery('.insert-gallery, .insert-playlist').show(); + jQuery('.insert-gallery').show(); } // Only show Save buttons when there is at least one file. @@ -171,7 +171,7 @@ function prepareMediaItemInit(fileObj) { success: function( ){ var type, item = jQuery('#media-item-' + fileObj.id); - + if ( type = jQuery('#type-of-' + fileObj.id).val() ) jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1); @@ -257,7 +257,7 @@ function deleteError() { } function uploadComplete() { - jQuery('#insert-gallery, #insert-playlist').prop('disabled', false); + jQuery('#insert-gallery').prop('disabled', false); } function switchUploader(s) { diff --git a/src/wp-includes/js/swfupload/handlers.js b/src/wp-includes/js/swfupload/handlers.js index 83b7a557fa..e27bd371f3 100644 --- a/src/wp-includes/js/swfupload/handlers.js +++ b/src/wp-includes/js/swfupload/handlers.js @@ -32,7 +32,7 @@ function fileQueued(fileObj) { function uploadStart(fileObj) { try { if ( typeof topWin.tb_remove != 'undefined' ) - topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove); + topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove); } catch(e){} return true; @@ -212,11 +212,11 @@ function updateMediaForm() { else jQuery('.savebutton').hide(); - // Only show Gallery/Playlist buttons when there are at least two files. + // Only show Gallery buttons when there are at least two files. if ( items.length > 1 ) { - jQuery('.insert-gallery, .insert-playlist').show(); + jQuery('.insert-gallery').show(); } else { - jQuery('.insert-gallery, .insert-playlist').hide(); + jQuery('.insert-gallery').hide(); } } @@ -239,7 +239,7 @@ function uploadComplete(fileObj) { // If no more uploads queued, enable the submit button if ( swfu.getStats().files_queued == 0 ) { jQuery('#cancel-upload').prop('disabled', true); - jQuery('#insert-gallery, #insert-playlist').prop('disabled', false); + jQuery('#insert-gallery').prop('disabled', false); } }