golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Uploader: fix check for error message send from async-upload on failed uploads, improve styling it a bit, props trepmal, SergeyBiryukov, fixes #20445 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-04-24 22:06:55 +00:00
parent df7bd632f2
commit b6b321a203
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/css/wp-admin.dev.css
View File

@ -3687,14 +3687,14 @@ abbr.required {
.media-upload-form .media-item.error p,
.media-item .error-div {
line-height: 16px;
font-size: 12px;
margin: 10px;
margin: 5px 10px;
padding: 0;
}
.media-item .error-div a.dismiss {
display: block;
float: right;
padding-left: 15px;
margin: 5px 4px 0 15px;
}
/*------------------------------------------------------------------------------

2
wp-includes/js/plupload/handlers.dev.js
View File

@ -83,7 +83,7 @@ function uploadSuccess(fileObj, serverData) {
serverData = serverData.replace(/^<pre>(\d+)<\/pre>$/, '$1');
// if async-upload returned an error message, place it in the media item div and return
if ( serverData.match('media-upload-error') ) {
if ( serverData.match(/media-upload-error|error-div/) ) {
item.html(serverData);
return;
} else {