';
}
-// post format fields
-if ( post_type_supports( $post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $post ) )
- require_once( './includes/post-formats.php' );
-
if ( post_type_supports($post_type, 'editor') ) {
?>
@@ -467,7 +389,7 @@ if ( post_type_supports($post_type, 'editor') ) {
post_content, 'content', array(
'dfw' => true,
'tabfocus_elements' => 'insert-media-button,save-post',
- 'editor_height' => in_array( $post_format, array( 'status', 'aside' ) ) ? 120 : 360
+ 'editor_height' => 360,
) ); ?>
| 0' ); ?> |
diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index 7e843e75c9..bde94e1545 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -1126,23 +1126,6 @@ function wp_ajax_closed_postboxes() {
wp_die( 1 );
}
-function wp_ajax_show_post_format_ui() {
- if ( empty( $_POST['post_type'] ) )
- wp_die( 0 );
-
- check_ajax_referer( 'show-post-format-ui_' . $_POST['post_type'], 'nonce' );
-
- if ( ! $post_type_object = get_post_type_object( $_POST['post_type'] ) )
- wp_die( 0 );
-
- if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
- wp_die( -1 );
-
- update_user_option( get_current_user_id(), 'post_formats_' . $post_type_object->name, empty( $_POST['show'] ) ? 0 : 1 );
-
- wp_die( 1 );
-}
-
function wp_ajax_hidden_columns() {
check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
$hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : '';
diff --git a/wp-admin/includes/post-formats.php b/wp-admin/includes/post-formats.php
deleted file mode 100644
index e2a58e74e0..0000000000
--- a/wp-admin/includes/post-formats.php
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wp-admin/js/post-formats.js b/wp-admin/js/post-formats.js
deleted file mode 100644
index 8e7ca2c79c..0000000000
--- a/wp-admin/js/post-formats.js
+++ /dev/null
@@ -1,361 +0,0 @@
-/*globals window, $, jQuery, document, _, postFormats, tinymce, ajaxurl, wp, getUserSetting */
-
-window.wp = window.wp || {};
-
-(function ($) {
- "use strict";
-
- var mediaFrame, insertMediaButton, container, icon, formatField,
- body,
- lastMimeType,
- classRegex = /\s?\bwp-format-[^ ]+/g,
- shortHeight = 120,
- lastHeight = 360,
- initialFormat = 'standard',
- shortClass = 'short-format',
- noTitleFormats = ['status'],
- noMediaFormats = ['status', 'aside', 'image', 'audio', 'video'],
- shortContentFormats = ['status', 'aside'],
- noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'];
-
- function imageFormatUploadProgress( uploader, file ) {
- var $bar = $( '#' + uploader.settings.drop_element + ' .media-progress-bar div' );
- $bar.width( file.percent + '%' );
- }
-
- function imageFormatUploadStart( uploader ) {
- $( '#' + uploader.settings.drop_element + ' .wp-format-media-select' ).append('');
- }
-
- function imageFormatUploadError() {
- $( '.media-progress-bar', $('.wp-format-media-holder[data-format=image]') ).remove();
- }
-
- function imageFormatUploadSuccess( attachment ) {
- var $holder, $field, html = wp.media.string.image({
- size : 'full',
- align : false,
- link : 'none'
- }, attachment.attributes );
-
- $holder = $('.wp-format-media-holder[data-format=image]');
- $( '.media-progress-bar', $holder ).remove();
-
- if ( 'image' !== attachment.attributes.type )
- return;
-
- $field = $( '#wp_format_' + $holder.data( 'format' ) );
-
- // set the hidden input's value
- $field.val( html );
-
- $( '#image-preview' ).remove();
-
- $holder.parent().prepend( [''].join( '' ) );
- }
-
- function imageFormatUploadFilesAdded( uploader, files ) {
- $.each( files, function( i, file ) {
- if ( i > 0 )
- uploader.removeFile(file);
- });
- }
-
- var uploader = {
- container: null,
- browser: null,
- dropzone: $('.wp-format-media-holder[data-format=image]'),
- success: imageFormatUploadSuccess,
- error: imageFormatUploadError,
- plupload: {
- runtimes: 'html5',
- filters: [ {title: 'Image', extensions: 'jpg,jpeg,gif,png'} ]
- },
- params: {}
- };
- uploader = new wp.Uploader( uploader );
-
- if ( uploader.supports.dragdrop ) {
- uploader.uploader.bind( 'BeforeUpload', imageFormatUploadStart );
- uploader.uploader.bind( 'UploadProgress', imageFormatUploadProgress );
- uploader.uploader.bind( 'FilesAdded', imageFormatUploadFilesAdded );
- } else {
- uploader.uploader.destroy();
- uploader = null;
- }
-
- function switchFormatClass( format ) {
- formatField.val( format );
-
- $.each( [ container, icon, body ], function(i, thing) {
- thing.prop( 'className', thing.prop( 'className' ).replace( classRegex, '' ) )
- .addClass( 'wp-format-' + format );
- });
- }
-
- function resizeContent( format, noAnimate ) {
- var height, content = $( '#content, #content_ifr' );
-
- height = content.outerHeight();
- if ( shortHeight < height ) {
- lastHeight = height;
- }
-
- if ( -1 < $.inArray( format, shortContentFormats ) ) {
- if ( ! content.hasClass( shortClass ) ) {
- content.addClass( shortClass );
- _(content).each(function (elem) {
- $(elem)[noAnimate ? 'css' : 'animate']( { height : shortHeight } );
- });
- }
- } else {
- content.removeClass( shortClass ).animate( { height : lastHeight } );
- }
- }
-
- function switchFormat(elem) {
- var editor, body, formatTo, formatFrom,
- format = elem.data( 'wp-format' ),
- titlePrompt = $( '#title-prompt-text' ),
- description = $( '.post-format-description' ),
- postTitle = $( '#title'),
- fields = $( '.post-formats-fields' ),
- tinyIcon = $( '.post-format-change span.icon' );
-
- if ( format === postFormats.currentPostFormat ) {
- return;
- }
-
- elem.addClass( 'active' ).siblings().removeClass( 'active' );
-
- // Animate the media button going away or coming back
- formatTo = -1 < $.inArray( format, noMediaFormats );
- formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noMediaFormats );
- if ( formatFrom ? !formatTo : formatTo ) { // XOR
- insertMediaButton.fadeToggle( 200 ).css( 'display', 'inline-block' );
- }
- // Animate the title going away or coming back
- formatTo = -1 < $.inArray( format, noTitleFormats );
- formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noTitleFormats );
- if ( formatFrom ? !formatTo : formatTo ) { // XOR
- $( '#titlewrap' ).fadeToggle( 200 );
- }
-
- // Animate the fields moving going away or coming in
- formatTo = -1 < $.inArray( format, noUIFormats );
- formatFrom = -1 < $.inArray( postFormats.currentPostFormat, noUIFormats );
- if ( formatTo && formatFrom ) { // To/from have no UI. No slide.
- switchFormatClass( format );
- fields.hide();
- } else if ( formatFrom ) { // Only destination has UI. Slide down.
- fields.hide();
- switchFormatClass( format );
- fields.slideDown( 400 );
- } else if ( formatTo ) { // Only source has UI. Slide up.
- fields.slideUp( 200, function(){
- switchFormatClass( format );
- });
- } else { // Both have UI. Slide both ways.
- fields.slideUp( 200, function(){
- switchFormatClass( format );
- fields.slideDown( 400 );
- });
- }
-
- resizeContent( format );
- postTitle.focus();
-
- if ( '' === postTitle.val() ) {
- titlePrompt.removeClass( 'screen-reader-text' );
-
- postTitle.keydown( function (e) {
- titlePrompt.addClass( 'screen-reader-text' );
- $( e.currentTarget ).unbind( e );
- } );
- }
-
- // Update description line
- description.html( elem.data( 'description' ) );
- tinyIcon
- .show()
- .prop( 'className', tinyIcon.prop( 'className' ).replace( classRegex, '' ) )
- .addClass( 'wp-format-' + format );
-
- if ( description.not( ':visible' ) ) {
- description.slideDown( 'fast' );
- }
-
- if ( typeof tinymce !== 'undefined' ) {
- editor = tinymce.get( 'content' );
-
- if ( editor ) {
- body = editor.getBody();
- body.className = body.className.replace( /\bpost-format-[^ ]+/, '' );
- editor.dom.addClass( body, 'post-format-' + format );
- }
- }
-
- // If gallery, force it to open to gallery state
- insertMediaButton.toggleClass( 'gallery', 'gallery' === format );
- postFormats.currentPostFormat = format;
- }
-
- $(function () {
- body = $( 'body' );
- container = $( '#post-body-content' );
- icon = $( '.icon32' );
- formatField = $( '#post_format' );
- insertMediaButton = $( '#insert-media-button' ).toggleClass( 'gallery', 'gallery' === postFormats.currentPostFormat );
- initialFormat = $( '.post-format-options .active' ).data( 'wp-format' );
-
- if ( -1 < $.inArray( initialFormat, shortContentFormats ) ) {
- resizeContent( initialFormat, true );
- }
-
- $( '#show_post_format_ui' ).on( 'change', function () {
- body.toggleClass( 'wp-post-format-show-ui', this.checked );
-
- // Reset the display properties of possibly hidden items.
- insertMediaButton.css( 'display', '' );
- $( '#titlewrap' ).css( 'display', '' );
-
- $.post( ajaxurl, {
- action: 'show-post-format-ui',
- post_type: $( '#post_type' ).val(),
- show: this.checked ? 1 : 0,
- nonce: $( '#show_post_format_ui_nonce' ).val()
- } );
- } );
-
- // Post formats selection
- $( '.post-format-options' ).on( 'click', 'a', function (e) {
- e.preventDefault();
- switchFormat( $( e.currentTarget ) );
- } );
-
- // Toggle select/upload and URL/HTML for images
- $( '.use-url-or-html' ).on( 'click', 'a', function(e) {
- e.preventDefault();
- $( '.wp-format-media-holder, .wp-format-image-textarea' ).toggle();
- $(this).closest( 'p' ).find( 'span' ).toggle();
- });
-
- // Media selection
- $( '.wp-format-media-select' ).click( function (e) {
- e.preventDefault();
-
- var $el = $(e.currentTarget), mediaPreview, mime = 'image', $holder, $field;
-
- $holder = $el.closest( '.wp-format-media-holder' );
- $field = $( '#wp_format_' + $holder.data( 'format' ) );
- mime = $holder.data( 'format' );
-
- // If the media frame already exists, reopen it.
- if ( mediaFrame && lastMimeType === mime ) {
- mediaFrame.open();
- return;
- }
-
- lastMimeType = mime;
-
- mediaFrame = wp.media.frames.formatMedia = wp.media( {
- button: {
- text: $el.data( 'update' )
- },
- states: [
- new wp.media.controller.Library({
- library: wp.media.query( { type: mime } ),
- title: $el.data( 'choose' ),
- displaySettings: 'image' === mime
- })
- ]
- } );
-
- mediaPreview = function (attachment) {
- var w, h, dimensions = '', url = attachment.url, mime = attachment.mime, format = attachment.type;
-
- if ( 'video' === format ) {
- if ( attachment.width ) {
- w = attachment.width;
- if ( w > 600 ) {
- w = 600;
- }
- dimensions += ' width="' + w + '"';
- }
-
- if ( attachment.height ) {
- h = attachment.height;
- if ( attachment.width && w < attachment.width ) {
- h = Math.round( ( h * w ) / attachment.width );
- }
- dimensions += ' height="' + h + '"';
- }
- }
-
- $( '#' + format + '-preview' ).remove();
- $holder.parent().prepend( '' +
- '<' + format + dimensions + ' class="wp-' + format + '-shortcode" controls="controls" preload="none">' +
- '' +
- '
' );
- $( '.wp-' + format + '-shortcode' ).mediaelementplayer();
- };
-
- // When an image is selected, run a callback.
- mediaFrame.on( 'select', function () {
- // Grab the selected attachment.
- var w = 0, h = 0, html, attachment = mediaFrame.state().get( 'selection' ).first().toJSON();
-
- if ( 0 === attachment.mime.indexOf( 'audio' ) ) {
- $field.val( attachment.url );
- // show one preview at a time
- mediaPreview( attachment );
- } else if ( 0 === attachment.mime.indexOf( 'video' ) ) {
- attachment.src = attachment.url;
- $field.val( wp.shortcode.string( {
- tag: 'video',
- attrs: _.pick( attachment, 'src', 'width', 'height' )
- } ) );
- // show one preview at a time
- mediaPreview( attachment );
- } else {
- html = wp.media.string.image({
- size: 'full',
- align : false,
- link : 'none'
- }, attachment);
-
- // set the hidden input's value
- $field.val( html );
-
- $( '#image-preview' ).remove();
-
- if ( attachment.width ) {
- w = attachment.width > 600 ? 600 : attachment.width;
- }
-
- if ( attachment.height ) {
- h = attachment.height;
- }
-
- if ( w < attachment.width ) {
- h = Math.round( ( h * w ) / attachment.width );
- }
-
- $holder.parent().prepend( [''].join( '' ) );
- }
- });
-
- mediaFrame.open();
- });
- });
-}( jQuery ) );
diff --git a/wp-admin/js/post-formats.min.js b/wp-admin/js/post-formats.min.js
deleted file mode 100644
index 136a64f6b4..0000000000
--- a/wp-admin/js/post-formats.min.js
+++ /dev/null
@@ -1 +0,0 @@
-window.wp=window.wp||{};(function(c){var y,n,k,t,q,j,w,m=/\s?\bwp-format-[^ ]+/g,g=120,s=360,v="standard",b="short-format",e=["status"],i=["status","aside","image","audio","video"],f=["status","aside"],d=["standard","chat","status","aside","gallery"];function x(C,A){var B=c("#"+C.settings.drop_element+" .media-progress-bar div");B.width(A.percent+"%")}function a(A){c("#"+A.settings.drop_element+" .wp-format-media-select").append('')}function r(){c(".media-progress-bar",c(".wp-format-media-holder[data-format=image]")).remove()}function l(D){var C,B,A=wp.media.string.image({size:"full",align:false,link:"none"},D.attributes);C=c(".wp-format-media-holder[data-format=image]");c(".media-progress-bar",C).remove();if("image"!==D.attributes.type){return}B=c("#wp_format_"+C.data("format"));B.val(A);c("#image-preview").remove();C.parent().prepend(['"].join(""))}function u(B,A){c.each(A,function(D,C){if(D>0){B.removeFile(C)}})}var p={container:null,browser:null,dropzone:c(".wp-format-media-holder[data-format=image]"),success:l,error:r,plupload:{runtimes:"html5",filters:[{title:"Image",extensions:"jpg,jpeg,gif,png"}]},params:{}};p=new wp.Uploader(p);if(p.supports.dragdrop){p.uploader.bind("BeforeUpload",a);p.uploader.bind("UploadProgress",x);p.uploader.bind("FilesAdded",u)}else{p.uploader.destroy();p=null}function z(A){q.val(A);c.each([k,t,j],function(C,B){B.prop("className",B.prop("className").replace(m,"")).addClass("wp-format-"+A)})}function h(D,B){var A,C=c("#content, #content_ifr");A=C.outerHeight();if(g600){G=600}J+=' width="'+G+'"'}if(M.height){I=M.height;if(M.width&&G<'+L+J+' class="wp-'+L+'-shortcode" controls="controls" preload="none">");c(".wp-"+L+"-shortcode").mediaelementplayer()};y.on("select",function(){var G=0,I=0,H,J=y.state().get("selection").first().toJSON();if(0===J.mime.indexOf("audio")){B.val(J.url);C(J)}else{if(0===J.mime.indexOf("video")){J.src=J.url;B.val(wp.shortcode.string({tag:"video",attrs:_.pick(J,"src","width","height")}));C(J)}else{H=wp.media.string.image({size:"full",align:false,link:"none"},J);B.val(H);c("#image-preview").remove();if(J.width){G=J.width>600?600:J.width}if(J.height){I=J.height}if(G','
",""].join(""))}}});y.open()})})}(jQuery));
\ No newline at end of file
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 297e69ff11..388163edff 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -2676,8 +2676,7 @@ function wp_insert_post($postarr, $wp_error = false) {
}
$maybe_empty = ! $post_content && ! $post_title && ! $post_excerpt && post_type_supports( $post_type, 'editor' )
- && post_type_supports( $post_type, 'title' ) && post_type_supports( $post_type, 'excerpt' )
- && ! in_array( get_post_format( $post_ID ), array( 'audio', 'video', 'quote', 'image' ) );
+ && post_type_supports( $post_type, 'title' ) && post_type_supports( $post_type, 'excerpt' );
if ( apply_filters( 'wp_insert_post_empty_content', $maybe_empty, $postarr ) ) {
if ( $wp_error )
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index e1752f0666..237ef0fc8a 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -415,8 +415,6 @@ function wp_default_scripts( &$scripts ) {
'comma' => _x( ',', 'tag delimiter' ),
) );
- $scripts->add( 'post-formats', "/wp-admin/js/post-formats$suffix.js", array( 'media-models', 'wp-plupload' ), false, 1 );
-
$scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );