sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a few unnecessary jQuery selectors added in [27239]. Playlists don't exist in some older contexts that galleries do.

Browse Source 
See #26631.



git-svn-id: https://develop.svn.wordpress.org/trunk@27243 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
wonderboymusic 2014-02-24 20:48:02 +00:00
parent 5ead62b90c
commit 29725ce426
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/js/plupload/handlers.js
View File

@ -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', '<a class="uploader-html" href="#">').replace('%2$s', '</a>'));
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) {

10
src/wp-includes/js/swfupload/handlers.js
View File

@ -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);
}
}