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

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18957 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2011-10-12 22:24:53 +00:00
parent 168e89007c
commit e10d951cce
6 changed files with 31 additions and 12 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

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

@ -3626,6 +3626,10 @@ p.popular-tags a {
display: none;
}
.media-upload-form {
margin-top: 20px;
}
.media-upload-form td label {
margin-right: 6px;
margin-left: 2px;
@ -3856,25 +3860,34 @@ form.upgrade .hint {
}
.drag-drop .drag-drop-inside {
padding-top: 60px;
margin: 70px auto 0;
width: 250px;
}
.drag-drop .drag-drop-inside p {
text-align: center;
}
.dragdrop-info {
.drag-drop-info {
color: #aaa;
display: none;
font-size: 24px;
margin: 10px 0;
}
.drag-drop .dragdrop-info {
.drag-drop .drag-drop-info {
display: block;
}
#plupload-upload-ui {
position: relative;
}
/*
#drag-drop-area:-moz-drag-over {
border-color: #cf5;
}
*/
/*------------------------------------------------------------------------------
14.2 - Image Editor
------------------------------------------------------------------------------*/

6
wp-admin/includes/media.php
View File

@ -1342,12 +1342,12 @@ resize_width = <?php echo get_option('large_size_w', 1024); ?>,
wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
</script>
<div id="plupload-upload-ui" class="hide-if-no-js drag-drop">
<div id="plupload-upload-ui" class="hide-if-no-js">
<?php do_action('pre-plupload-upload-ui'); // hook change, old name: 'pre-flash-upload-ui' ?>
<div id="drag-drop-area">
<div class="drag-drop-inside">
<p class="dragdrop-info"><?php _e('Drop files here or'); ?></p>
<p><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" />
<p class="drag-drop-info"><?php _e('Drop files here or'); ?></p>
<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" />
<input id="cancel-upload" disabled="true" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></p>
</div>
</div>

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

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

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

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