summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-22 15:04:25 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-22 15:04:25 +0000
commit17a1af6c5ef280ba4a8ef8d00bae466b292c16f0 (patch)
treee06c0821a4eb76a1c0ec13a69c4802909d64cdb0
parent246f80fc39200b7a603de15c31e9636a580e3d3c (diff)
downloadwordpress-mu-17a1af6c5ef280ba4a8ef8d00bae466b292c16f0.tar.gz
wordpress-mu-17a1af6c5ef280ba4a8ef8d00bae466b292c16f0.tar.xz
wordpress-mu-17a1af6c5ef280ba4a8ef8d00bae466b292c16f0.zip
Applied patch in http://trac.wordpress.org/ticket/6443
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1255 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-admin/includes/media.php2
-rw-r--r--wp-includes/js/swfupload/handlers.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 5803e3f..d8c3858 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -814,7 +814,7 @@ jQuery(function($){
file_queue_error_handler : fileQueueError,
file_dialog_complete_handler : fileDialogComplete,
- debug: false,
+ debug: false
});
$("#flash-browse-button").bind( "click", function(){swfu.selectFiles();});
});
diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js
index 7369482..c33d545 100644
--- a/wp-includes/js/swfupload/handlers.js
+++ b/wp-includes/js/swfupload/handlers.js
@@ -96,7 +96,7 @@ function deleteSuccess(data, textStatus) {
jQuery('#media-item-' + this.id + ' .filename').append(' <span class="file-error">'+swfuploadL10n.deleted+'</span>').siblings('a.toggle').remove();
jQuery('#media-item-' + this.id).children('.describe').css({backgroundColor:'#fff'}).end()
.animate({backgroundColor:'#ffc0c0'}, {queue:false,duration:50})
- .animate({minHeight:0,height:36,}, 400, null, function(){jQuery(this).children('.describe').remove()})
+ .animate({minHeight:0,height:36}, 400, null, function(){jQuery(this).children('.describe').remove()})
.animate({backgroundColor:'#fff'}, 400)
.animate({height:0}, 800, null, function(){jQuery(this).remove();updateMediaForm();});