Fix visibility of Select Files button in IE7, change border color when hovering over the drag drop area of the uploader, see #18918, see #18206
git-svn-id: http://svn.automattic.com/wordpress/trunk@18957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -398,8 +398,14 @@ jQuery(document).ready(function($){
|
||||
uploader.bind('Init', function(up) {
|
||||
setResize( getUserSetting('upload_resize', false) );
|
||||
|
||||
if ( !up.features.dragdrop )
|
||||
$('#plupload-upload-ui').removeClass('drag-drop');
|
||||
if ( up.features.dragdrop ) {
|
||||
$('#plupload-upload-ui').addClass('drag-drop');
|
||||
$('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
|
||||
$(this).css('border-color', '#ccff55');
|
||||
}).bind('dragleave.wp-uploader, drop.wp-uploader', function(){
|
||||
$(this).css('border-color', '');
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
uploader.init();
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -220,7 +220,7 @@ function wp_default_scripts( &$scripts ) {
|
||||
// cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
|
||||
$scripts->add( 'plupload-full', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.5b');
|
||||
|
||||
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20110917');
|
||||
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20111012');
|
||||
$scripts->add_script_data( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
|
||||
|
||||
// keep 'swfupload' for back-compat.
|
||||
@@ -431,7 +431,7 @@ function wp_default_styles( &$styles ) {
|
||||
// Any rtl stylesheets that don't have a .dev version for ltr
|
||||
$no_suffix = array( 'farbtastic' );
|
||||
|
||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111011c' );
|
||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111012' );
|
||||
|
||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111010' );
|
||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||
|
||||
Reference in New Issue
Block a user