WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the drop target border color, props ocean90, fixes #19298 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-20 19:16:35 +00:00
parent 3374c6e672
commit 3287ef6d9c
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin.css
View File

File diff suppressed because one or more lines are too long

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

@ -3943,15 +3943,20 @@ form.upgrade .hint {
display: block; display: block;
} }
/*
#drag-drop-area:-moz-drag-over {
border-color: #83b4d8;
}
borger color while dragging a file over the uploader drop area */
.drag-drop.drag-over #drag-drop-area {
border-color: #83b4d8;
}
#plupload-upload-ui { #plupload-upload-ui {
position: relative; position: relative;
} }
/*
#drag-drop-area:-moz-drag-over {
border-color: #cf5;
}
*/
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
14.2 - Image Editor 14.2 - Image Editor
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/

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

@ -411,17 +411,19 @@ jQuery(document).ready(function($){
}); });
uploader.bind('Init', function(up) { uploader.bind('Init', function(up) {
var uploaddiv = $('#plupload-upload-ui');
setResize( getUserSetting('upload_resize', false) ); setResize( getUserSetting('upload_resize', false) );
if ( up.features.dragdrop ) { if ( up.features.dragdrop ) {
$('#plupload-upload-ui').addClass('drag-drop'); uploaddiv.addClass('drag-drop');
$('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :( $('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
$(this).css('border-color', '#ccff55'); uploaddiv.addClass('drag-over');
}).bind('dragleave.wp-uploader, drop.wp-uploader', function(){ }).bind('dragleave.wp-uploader, drop.wp-uploader', function(){
$(this).css('border-color', ''); uploaddiv.removeClass('drag-over');
}); });
} else { } else {
$('#plupload-upload-ui').removeClass('drag-drop'); uploaddiv.removeClass('drag-drop');
$('#drag-drop-area').unbind('.wp-uploader'); $('#drag-drop-area').unbind('.wp-uploader');
} }
}); });

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

File diff suppressed because one or more lines are too long

4
wp-includes/script-loader.php
View File

@ -222,7 +222,7 @@ function wp_default_scripts( &$scripts ) {
// cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo // cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
$scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1511-20111112'); $scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1511-20111112');
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery'), '20111119'); $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery'), '20111120');
$scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n ); $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
// keep 'swfupload' for back-compat. // keep 'swfupload' for back-compat.
@ -433,7 +433,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr // Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111120' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111120a' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111119' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111119' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );