Index: src/wp-includes/class-wp-editor.php =================================================================== --- src/wp-includes/class-wp-editor.php (revision 26957) +++ src/wp-includes/class-wp-editor.php (working copy) @@ -231,6 +231,7 @@ 'image', 'fullscreen', 'wordpress', + 'wpaudiovideo', 'wpeditimage', 'wpgallery', 'wplink', @@ -331,8 +332,12 @@ self::$first_init['spellchecker_language'] = self::$mce_locale; } + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + $version = 'ver=' . $GLOBALS['wp_version']; + $dashicons = includes_url( "css/dashicons$suffix.css?$version" ); + // WordPress default stylesheet - $mce_css = array( self::$baseurl . '/skins/wordpress/wp-content.css' ); + $mce_css = array( $dashicons, self::$baseurl . '/skins/wordpress/wp-content.css' ); // load editor_style.css if the current theme supports it if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) { Index: src/wp-includes/formatting.php =================================================================== --- src/wp-includes/formatting.php (revision 26957) +++ src/wp-includes/formatting.php (working copy) @@ -242,6 +242,9 @@ $pee = preg_replace('|\s*]*)>\s*|', "", $pee); // no pee inside object/embed $pee = preg_replace('|\s*\s*|', '', $pee); } + if ( preg_match( '|[\[<]video|', $pee ) ) { + $pee = preg_replace( '#\s*<(track|source)([^>]*)>\s*#', '<$1$2>', $pee ); // no pee inside video tag/shortcode + } $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates // make paragraphs, including one at the end $pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY); @@ -258,6 +261,7 @@ $pee = preg_replace('!(]*>)\s*

!', "$1", $pee); if ( $br ) { $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee); + $pee = preg_replace_callback('/[\[<]video.*?[\[<]\/video[\]>]/s', '_autop_newline_preservation_helper', $pee); $pee = preg_replace('|(?)\s*\n|', "
\n", $pee); // optionally make line breaks $pee = str_replace('', "\n", $pee); } Index: src/wp-includes/js/tinymce/plugins/wpaudiovideo/plugin.js =================================================================== --- src/wp-includes/js/tinymce/plugins/wpaudiovideo/plugin.js (revision 0) +++ src/wp-includes/js/tinymce/plugins/wpaudiovideo/plugin.js (working copy) @@ -0,0 +1,74 @@ +/* global tinymce */ +tinymce.PluginManager.add( 'wpaudiovideo', function( editor ) { + + function parseMediaShortcode( content ) { + return content.replace( /\[(audio|video)[^\]]*\][\s\S]*?\[\/\1\]/g, function( match, type ) { + var data = tinymce.DOM.encode( match.substr(1) ), + cls = 'wp-media-shortcode dashicons dashicons-format-' + type; + + return '
\u00a0
'; + }); + } + + function getMediaShortcode( content ) { + function getAttr( str, name ) { + name = new RegExp( name + '=\"([^\"]+)\"', 'g' ).exec( str ); + return name ? tinymce.DOM.decode( name[1] ) : ''; + } + + return content.replace( /
]+)>(\u00a0| )*<\/div>/g, function( match, attr ) { + var cls = getAttr( attr, 'class' ); + + if ( cls.indexOf('wp-media-shortcode') !== -1 ) { + return tinymce.trim( '[' + getAttr( attr, 'title' ) ); + } + + return match; + }); + } + + editor.on( 'BeforeSetContent', function( e ) { + e.content = parseMediaShortcode( e.content ); + }); + + editor.on( 'PostProcess', function( e ) { + if ( e.get ) { + e.content = getMediaShortcode( e.content ); + } + }); + + editor.on( 'init', function() { + var dom = editor.dom; + + editor.on( 'mousedown', function( event ) { + if ( dom.hasClass( event.target, 'wp-media-shortcode' ) ) { + dom.addClass( event.target, 'wp-media-shortcode-selected' ) + // Prevent IE from making the div resizable + dom.events.cancel( event ); + } else { + dom.removeClass( dom.select( '.wp-media-shortcode-selected' ), 'wp-media-shortcode-selected' ); + } + }); + + editor.on( 'keydown', function( event ) { + var element; + + if ( event.keyCode !== tinymce.util.VK.DELETE && event.keyCode !== tinymce.util.VK.BACKSPACE ) { + return; + } + + element = dom.select( 'div.wp-media-shortcode-selected' ); + + if ( element.length ) { + dom.events.cancel( event ); + dom.remove( element[0] ); + editor.nodeChanged(); + } + }); + }); + + return { + parseMediaShortcode: parseMediaShortcode, + getMediaShortcode: getMediaShortcode + }; +}); \ No newline at end of file Index: src/wp-includes/js/tinymce/skins/wordpress/wp-content.css =================================================================== --- src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (revision 26957) +++ src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (working copy) @@ -127,6 +127,38 @@ border-style: solid; } +/* Audio/video shortcodes */ +.mce-content-body .wp-media-shortcode { + margin-bottom: 20px; + border: 1px dashed #888; + background: #f2f2f2; + width: 99%; + height: 250px; + line-height: 250px; + outline: 0; + cursor: default; + color: transparent; + font-size: 48px; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} + +.mce-content-body .wp-media-shortcode:before { + color: #444; +} + +.mce-content-body .wp-media-shortcode.dashicons-format-audio { + height: 40px; + line-height: 40px; + font-size: 20px; +} + +.mce-content-body .wp-media-shortcode-selected { + background-color: #ededed; + border-style: solid; +} + img.wp-oembed { border: 1px dashed #888; background: #f7f5f2 url("images/embedded.png") no-repeat scroll center center; Index: src/wp-includes/media.php =================================================================== --- src/wp-includes/media.php (revision 26957) +++ src/wp-includes/media.php (working copy) @@ -1223,6 +1223,14 @@ $html .= sprintf( $source, $type['type'], esc_url( $$fallback ) ); } } + + if ( ! empty( $content ) ) { + if ( false !== strpos( $content, "\n" ) ) + $content = str_replace( array( "\r", "\n", "\t" ), '', $content ); + + $html .= trim( $content ); + } + if ( 'mediaelement' === $library ) $html .= wp_mediaelement_fallback( $fileurl ); $html .= ''; Index: tests/phpunit/tests/media.php =================================================================== --- tests/phpunit/tests/media.php (revision 26957) +++ tests/phpunit/tests/media.php (working copy) @@ -346,4 +346,41 @@ $matches = get_media_embedded_in_content( $content, $types ); $this->assertEquals( $contents, $matches ); } + + function test_video_shortcode_body() { + $width = 640; + $height = 360; + + $video =<<