Improve handling of plupload init and add a filter, stop including cookies in the init (not needed with plupload), see #18206
git-svn-id: http://svn.automattic.com/wordpress/trunk@18674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
parent
bff7722dd1
commit
2605391379
File diff suppressed because one or more lines are too long
|
|
@ -300,10 +300,6 @@ div.error a {
|
|||
color: #666;
|
||||
}
|
||||
|
||||
.media-item {
|
||||
border-bottom-color: #dfdfdf;
|
||||
}
|
||||
|
||||
#wpbody-content #media-items .describe {
|
||||
border-top-color: #dfdfdf;
|
||||
}
|
||||
|
|
@ -646,7 +642,8 @@ input.readonly, textarea.readonly {
|
|||
}
|
||||
|
||||
#media-items,
|
||||
.imgedit-group {
|
||||
.imgedit-group,
|
||||
.media-item {
|
||||
border-color: #dfdfdf;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -300,10 +300,6 @@ div.error a {
|
|||
color: #666;
|
||||
}
|
||||
|
||||
.media-item {
|
||||
border-bottom-color: #dfdfdf;
|
||||
}
|
||||
|
||||
#wpbody-content #media-items .describe {
|
||||
border-top-color: #dfdfdf;
|
||||
}
|
||||
|
|
@ -633,7 +629,8 @@ input.readonly, textarea.readonly {
|
|||
}
|
||||
|
||||
#media-items,
|
||||
.imgedit-group {
|
||||
.imgedit-group,
|
||||
.media-item {
|
||||
border-color: #dfdfdf;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.error{padding:2px 8px;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:sans-serif;font-style:italic;font-weight:normal;}#media-upload tr.image-size td.field{text-align:center;}#media-upload #media-items{border-width:1px;border-style:solid;border-bottom:none;width:623px;}#media-upload .media-item{border-bottom-width:1px;border-bottom-style:solid;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{width:100%;clear:both;cursor:default;}#media-upload .slidetoggle{border-top-width:1px;border-top-style:solid;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.align td.field{text-align:center;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA;}h3.media-title{font-size:1.6em;}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px;}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:normal;color:#5A5A5A;}#gallery-settings .describe td{vertical-align:middle;height:3em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;}
|
||||
div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.error{padding:2px 8px;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:sans-serif;font-style:italic;font-weight:normal;}#media-upload #media-items{border-bottom-width:1px;border-bottom-style:solid;width:623px;}#media-upload #media-items:empty{border:0 none;}#media-upload .media-item{border-style:solid solid none;border-width:1px 1px 0;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{width:100%;clear:both;cursor:default;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA;}h3.media-title{font-size:1.6em;}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px;}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:normal;color:#5A5A5A;}#gallery-settings .describe td{vertical-align:middle;height:3em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;}
|
||||
|
|
@ -157,14 +157,9 @@ abbr.required {
|
|||
font-weight: normal;
|
||||
}
|
||||
|
||||
#media-upload tr.image-size td.field {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#media-upload #media-items {
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-bottom: none;
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-style: solid;
|
||||
width: 623px;
|
||||
}
|
||||
|
||||
|
|
@ -173,8 +168,8 @@ abbr.required {
|
|||
}
|
||||
|
||||
#media-upload .media-item {
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-style: solid;
|
||||
border-style: solid solid none;
|
||||
border-width: 1px 1px 0;
|
||||
min-height: 36px;
|
||||
width: 100%;
|
||||
}
|
||||
|
|
@ -195,21 +190,12 @@ abbr.required {
|
|||
cursor: default;
|
||||
}
|
||||
|
||||
#media-upload .slidetoggle {
|
||||
border-top-width: 1px;
|
||||
border-top-style: solid;
|
||||
}
|
||||
|
||||
#media-upload .describe th.label {
|
||||
padding-top: .2em;
|
||||
text-align: left;
|
||||
min-width: 120px;
|
||||
}
|
||||
|
||||
#media-upload tr.align td.field {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#media-upload tr.image-size {
|
||||
margin-bottom: 1em;
|
||||
height: 3em;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -3708,6 +3708,10 @@ abbr.required {
|
|||
width: 670px;
|
||||
}
|
||||
|
||||
#wpbody-content #media-items:empty {
|
||||
border: 0 none;
|
||||
}
|
||||
|
||||
#wpbody-content #media-items .filename {
|
||||
line-height: 36px;
|
||||
overflow: hidden;
|
||||
|
|
@ -7622,71 +7626,72 @@ a.widget-control-edit {
|
|||
|
||||
@media only screen and (max-width: 768px) {
|
||||
/* categories */
|
||||
#col-left{
|
||||
width: 100%;
|
||||
#col-left {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#col-right{
|
||||
width: 100%;
|
||||
#col-right {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 769px) {
|
||||
/* categories */
|
||||
#col-left{
|
||||
width: 25%;
|
||||
#col-left {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
#col-right{
|
||||
width: 75%;
|
||||
#col-right {
|
||||
width: 75%;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 860px) {
|
||||
|
||||
/* categories */
|
||||
#col-left{
|
||||
width: 25%;
|
||||
#col-left {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
#col-right{
|
||||
width: 75%;
|
||||
#col-right {
|
||||
width: 75%;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 980px) {
|
||||
|
||||
/* categories */
|
||||
#col-left{
|
||||
width: 25%;
|
||||
#col-left {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
#col-right{
|
||||
width: 75%;
|
||||
#col-right {
|
||||
width: 75%;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 768px) {
|
||||
/* categories */
|
||||
#col-left{
|
||||
width: 100%;
|
||||
#col-left {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#col-right{
|
||||
width: 100%;
|
||||
#col-right {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.form-field input, .form-field textarea{
|
||||
width: 99%;
|
||||
.form-field input,
|
||||
.form-field textarea {
|
||||
width: 99%;
|
||||
}
|
||||
|
||||
.form-wrap .form-field{
|
||||
padding:0;
|
||||
.form-wrap .form-field {
|
||||
padding:0;
|
||||
}
|
||||
|
||||
/* users */
|
||||
#profile-page .form-table textarea{
|
||||
max-width: 400px;
|
||||
width: auto;
|
||||
#profile-page .form-table textarea {
|
||||
max-width: 400px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1470,12 +1470,8 @@ if ( is_multisite() && !is_upload_space_available() ) {
|
|||
|
||||
do_action('pre-upload-ui');
|
||||
|
||||
// Set the post params, which plupload will post back with the file, and pass
|
||||
// them through a filter.
|
||||
$post_params = array(
|
||||
"post_id" => $post_id,
|
||||
"auth_cookie" => (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]),
|
||||
"logged_in_cookie" => $_COOKIE[LOGGED_IN_COOKIE],
|
||||
"_wpnonce" => wp_create_nonce('media-form'),
|
||||
"type" => $type,
|
||||
"tab" => $tab,
|
||||
|
|
@ -1483,99 +1479,43 @@ $post_params = array(
|
|||
);
|
||||
|
||||
$post_params = apply_filters( 'upload_post_params', $post_params ); // hook change! old name: 'swfupload_post_params'
|
||||
$p = array();
|
||||
|
||||
foreach ( $post_params as $param => $val ) {
|
||||
$val = esc_js( $val );
|
||||
$p[] = "'$param' : '$val'";
|
||||
}
|
||||
$plupload_init = array(
|
||||
'runtimes' => 'html5,silverlight,flash,html4',
|
||||
'browse_button' => 'plupload-browse-button',
|
||||
'container' => 'plupload-upload-ui',
|
||||
'drop_element' => 'wpwrap',
|
||||
'file_data_name' => 'async-upload',
|
||||
'multiple_queues' => true,
|
||||
'max_file_size' => round( (int) $max_upload_size / 1024 ) . 'kb',
|
||||
'url' => $upload_action_url,
|
||||
'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
||||
'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
||||
'filters' => array( array('title' => __( 'Allowed Files' ), 'extensions' => '*') ),
|
||||
'multipart' => true,
|
||||
'urlstream_upload' => true,
|
||||
'multipart_params' => $post_params
|
||||
);
|
||||
|
||||
$post_params_str = implode( ',', $p ). "\n";
|
||||
$plupload_init = apply_filters( 'plupload_init', $plupload_init );
|
||||
|
||||
?>
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
var resize_height = <?php echo get_option('large_size_h', 1024); ?>,
|
||||
resize_width = <?php echo get_option('large_size_w', 1024); ?>;
|
||||
|
||||
jQuery(document).ready(function($) {
|
||||
window.uploader = new plupload.Uploader({
|
||||
runtimes: '<?php echo apply_filters('plupload_runtimes', 'html5,silverlight,flash,html4'); ?>',
|
||||
browse_button: 'plupload-browse-button',
|
||||
container: 'plupload-upload-ui',
|
||||
drop_element: 'media-upload',
|
||||
file_data_name: 'async-upload',
|
||||
max_file_size: '<?php echo round( (int) $max_upload_size / 1024 ); ?>kb',
|
||||
url: '<?php echo esc_js( $upload_action_url ); ?>',
|
||||
flash_swf_url: '<?php echo esc_js( includes_url('js/plupload/plupload.flash.swf') ); ?>',
|
||||
silverlight_xap_url: '<?php echo esc_js( includes_url('js/plupload/plupload.silverlight.xap') ); ?>',
|
||||
filters: [
|
||||
{title: '<?php echo esc_js( __( 'Allowed Files' ) ); ?>', extensions: '<?php echo esc_js( apply_filters('uploader_allowed_extensions', '*') ); ?>'}
|
||||
],
|
||||
multipart: true,
|
||||
urlstream_upload: true,
|
||||
multipart_params : {
|
||||
<?php echo $post_params_str; ?>
|
||||
}
|
||||
});
|
||||
|
||||
setResize( getUserSetting('upload_resize', false) );
|
||||
|
||||
$('#image_resize').bind('change', function() {
|
||||
var arg = $(this).prop('checked');
|
||||
|
||||
setResize( arg );
|
||||
|
||||
if ( arg )
|
||||
setUserSetting('upload_resize', 1);
|
||||
else
|
||||
deleteUserSetting('upload_resize');
|
||||
});
|
||||
|
||||
uploader.init();
|
||||
|
||||
uploader.bind('FilesAdded', function(up, files) {
|
||||
$.each(files, function(i, file) {
|
||||
fileQueued(file);
|
||||
});
|
||||
|
||||
up.refresh();
|
||||
up.start();
|
||||
});
|
||||
|
||||
uploader.bind('BeforeUpload', function(up, file) {
|
||||
uploadStart(file);
|
||||
});
|
||||
|
||||
uploader.bind('UploadProgress', function(up, file) {
|
||||
uploadProgress(file, file.loaded, file.size);
|
||||
});
|
||||
|
||||
uploader.bind('Error', function(up, err) {
|
||||
uploadError(err.file, err.code, err.message);
|
||||
|
||||
up.refresh();
|
||||
});
|
||||
|
||||
uploader.bind('FileUploaded', function(up, file, response) {
|
||||
<?php echo apply_filters( 'plupload_success_handler', 'uploadSuccess' ); ?>(file, response.response);
|
||||
});
|
||||
|
||||
if ( uploader.runtime == 'html5' )
|
||||
$('.dragdrop-info').show();
|
||||
});
|
||||
//]]>
|
||||
var resize_height = <?php echo get_option('large_size_h', 1024); ?>,
|
||||
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">
|
||||
<?php do_action('pre-plupload-upload-ui'); // hook change, old name: 'pre-flash-upload-ui' ?>
|
||||
|
||||
<div>
|
||||
<p>
|
||||
<?php _e( 'Choose files to upload' ); ?>
|
||||
<input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" />
|
||||
<input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" />
|
||||
</div>
|
||||
<p class="dragdrop-info howto"><?php _e('Or you can drop the files into this window.'); ?></p>
|
||||
</p>
|
||||
<p class="dragdrop-info"><?php _e('Or you can drop the files into this window.'); ?></p>
|
||||
<?php do_action('post-plupload-upload-ui'); // hook change, old name: 'post-flash-upload-ui' ?>
|
||||
</div>
|
||||
|
||||
|
|
@ -1588,14 +1528,14 @@ jQuery(document).ready(function($) {
|
|||
<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
|
||||
</p>
|
||||
<div class="clear"></div>
|
||||
<?php do_action('post-html-upload-ui', $plupload); ?>
|
||||
<?php do_action('post-html-upload-ui'); ?>
|
||||
</div>
|
||||
|
||||
<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></p>
|
||||
<p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
|
||||
|
||||
<?php do_action('post-upload-ui'); ?>
|
||||
<?php
|
||||
do_action('post-upload-ui');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2281,11 +2221,12 @@ function _insert_into_post_button($type) {
|
|||
* @since 2.6.0
|
||||
*/
|
||||
function media_upload_max_image_resize() {
|
||||
$checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
|
||||
?>
|
||||
<label>
|
||||
<input name="image_resize" type="checkbox" id="image_resize" value="true" />
|
||||
<p class="hide-if-no-js"><label>
|
||||
<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
|
||||
<?php printf( __( 'Scale images to max width %1$dpx or max height %2$dpx' ), (int) get_option( 'large_size_w' ), (int) get_option( 'large_size_h' ) ); ?>
|
||||
</label>
|
||||
</label></p>
|
||||
<?php
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ if ( isset($_GET['inline']) ) {
|
|||
</script>
|
||||
<input type="hidden" name="post_id" id="post_id" value="0" />
|
||||
<?php wp_nonce_field('media-form'); ?>
|
||||
<div id="media-items" class="hide-if-no-js"> </div>
|
||||
<div id="media-items" class="hide-if-no-js"></div>
|
||||
<?php submit_button( __( 'Save all changes' ), 'button savebutton hide-if-no-js', 'save' ); ?>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
var topWin = window.dialogArguments || opener || parent || top;
|
||||
var topWin = window.dialogArguments || opener || parent || top, uploader, uploader_init;
|
||||
|
||||
function fileDialogStart() {
|
||||
jQuery("#media-upload-error").empty();
|
||||
|
|
@ -79,14 +79,15 @@ function uploadSuccess(fileObj, serverData) {
|
|||
jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
|
||||
}
|
||||
|
||||
function setResize(r) {
|
||||
jQuery('#image_resize').prop('checked', r);
|
||||
if (r) {
|
||||
uploader.settings.resize = { width: resize_width, height: resize_height, quality: 100 };
|
||||
uploader.settings.multipart_params.image_resize = true;
|
||||
function setResize(arg) {
|
||||
if ( arg ) {
|
||||
if ( uploader.features.jpgresize )
|
||||
uploader.settings['resize'] = { width: resize_width, height: resize_height, quality: 100 };
|
||||
else
|
||||
uploader.settings.multipart_params.image_resize = true;
|
||||
} else {
|
||||
uploader.settings.resize = {};
|
||||
uploader.settings.multipart_params.image_resize = false;
|
||||
delete(uploader.settings.resize);
|
||||
delete(uploader.settings.multipart_params.image_resize);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -359,8 +360,8 @@ function uploadError(fileObj, errorCode, message) {
|
|||
}
|
||||
}
|
||||
|
||||
// remember the last used image size, alignment and url
|
||||
jQuery(document).ready(function($){
|
||||
// remember the last used image size, alignment and url
|
||||
$('input[type="radio"]', '#media-items').live('click', function(){
|
||||
var tr = $(this).closest('tr');
|
||||
|
||||
|
|
@ -378,4 +379,72 @@ jQuery(document).ready(function($){
|
|||
$(this).siblings('.urlfield').val( $(this).attr('title') );
|
||||
}
|
||||
});
|
||||
|
||||
// init and set the uploader
|
||||
uploader_init = function() {
|
||||
uploader = new plupload.Uploader(wpUploaderInit);
|
||||
|
||||
$('#image_resize').bind('change', function() {
|
||||
var arg = $(this).prop('checked');
|
||||
|
||||
setResize( arg );
|
||||
|
||||
if ( arg )
|
||||
setUserSetting('upload_resize', '1');
|
||||
else
|
||||
deleteUserSetting('upload_resize');
|
||||
});
|
||||
|
||||
uploader.bind('Init', function(up) {
|
||||
setResize( getUserSetting('upload_resize', false) );
|
||||
|
||||
if ( up.features.dragdrop ) {
|
||||
$('.dragdrop-info').show();
|
||||
|
||||
if ( $('#media-upload').length )
|
||||
up.settings.drop_element = 'media-upload';
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
uploader.init();
|
||||
|
||||
uploader.bind('FilesAdded', function(up, files) {
|
||||
$.each(files, function(i, file) {
|
||||
/*
|
||||
if ( up.features.chunks && up.runtime != 'flash' && file.size > 1048576 )
|
||||
up.settings.chunk_size = '1048576';
|
||||
else
|
||||
delete(up.settings.chunk_size);
|
||||
*/
|
||||
|
||||
fileQueued(file);
|
||||
});
|
||||
|
||||
up.refresh();
|
||||
up.start();
|
||||
});
|
||||
|
||||
uploader.bind('BeforeUpload', function(up, file) {
|
||||
uploadStart(file);
|
||||
});
|
||||
|
||||
uploader.bind('UploadProgress', function(up, file) {
|
||||
uploadProgress(file, file.loaded, file.size);
|
||||
});
|
||||
|
||||
uploader.bind('Error', function(up, err) {
|
||||
uploadError(err.file, err.code, err.message);
|
||||
|
||||
up.refresh();
|
||||
});
|
||||
|
||||
uploader.bind('FileUploaded', function(up, file, response) {
|
||||
uploadSuccess(file, response.response);
|
||||
});
|
||||
}
|
||||
|
||||
if ( typeof(wpUploaderInit) == 'object' )
|
||||
uploader_init();
|
||||
|
||||
});
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -190,10 +190,10 @@ function wp_default_scripts( &$scripts ) {
|
|||
$scripts->add( 'plupload-gears', '/wp-includes/js/plupload/plupload.gears.js', array('plupload'), '1.4.3.2');
|
||||
$scripts->add( 'plupload-html4', '/wp-includes/js/plupload/plupload.html4.js', array('plupload'), '1.4.3.2');
|
||||
|
||||
// TODO: find out if we can use the plupload.full.js, it loads browserplus init JS from Yahoo
|
||||
// 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.4.3.2');
|
||||
|
||||
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20110829');
|
||||
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20110914');
|
||||
$scripts->add_script_data( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
|
||||
|
||||
// keep 'swfupload' for back-compat.
|
||||
|
|
@ -408,7 +408,7 @@ function wp_default_styles( &$styles ) {
|
|||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||
|
||||
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
||||
$colors_version = '20110829';
|
||||
$colors_version = '20110914';
|
||||
|
||||
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
|
||||
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
|
||||
|
|
@ -417,7 +417,7 @@ function wp_default_styles( &$styles ) {
|
|||
$styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array('wp-admin'), $colors_version );
|
||||
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version );
|
||||
|
||||
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110707' );
|
||||
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110914' );
|
||||
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well
|
||||
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
|
||||
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
|
||||
|
|
|
|||
Loading…
Reference in New Issue