WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 22:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some Insert-into-Post for Audio/Video bugs.

Browse Source 
props wonderboymusic. see #23831.

git-svn-id: http://core.svn.wordpress.org/trunk@23870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-03-29 20:35:23 +00:00
parent c254787f0c
commit e3b7b18d26
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/js/media-editor.js
View File

@ -100,32 +100,31 @@
var shortcode, html;
props = wp.media.string.props( props, attachment );
shortcode = {};
if ( props.mime ) {
switch ( props.mime ) {
case 'audio/mpeg':
if ( props.linkUrl.indexOf( 'mp3' ) )
shortcode.mp3 = props.linkUrl;
else if ( props.linkUrl.indexOf( 'm4a' ) )
shortcode.m4a = props.linkUrl;
if ( attachment.url.indexOf( 'mp3' ) )
shortcode.mp3 = attachment.url;
else if ( attachment.url.indexOf( 'm4a' ) )
shortcode.m4a = attachment.url;
break;
case 'audio/mp3':
shortcode.mp3 = props.linkUrl;
shortcode.mp3 = attachment.url;
break;
case 'audio/m4a':
shortcode.m4a = props.linkUrl;
shortcode.m4a = attachment.url;
break;
case 'audio/wav':
shortcode.wav = props.linkUrl;
shortcode.wav = attachment.url;
break;
case 'audio/ogg':
shortcode.ogg = props.linkUrl;
shortcode.ogg = attachment.url;
break;
case 'audio/x-ms-wma':
case 'audio/wma':
shortcode.wma = props.linkUrl;
shortcode.wma = attachment.url;
break;
}
}
@ -148,25 +147,25 @@
if ( props.mime ) {
switch ( props.mime ) {
case 'video/mp4':
shortcode.mp4 = props.linkUrl;
shortcode.mp4 = attachment.url;
break;
case 'video/m4v':
shortcode.m4v = props.linkUrl;
shortcode.m4v = attachment.url;
break;
case 'video/webm':
shortcode.webm = props.linkUrl;
shortcode.webm = attachment.url;
break;
case 'video/ogg':
shortcode.ogv = props.linkUrl;
shortcode.ogv = attachment.url;
break;
case 'video/x-ms-wmv':
case 'video/wmv':
case 'video/asf':
shortcode.wmv = props.linkUrl;
shortcode.wmv = attachment.url;
break;
case 'video/flv':
case 'video/x-flv':
shortcode.flv = props.linkUrl;
shortcode.flv = attachment.url
break;
}
}
@ -660,9 +659,9 @@
options[ option ] = props[ prop ];
});
} else if ( 'video' === attachment.type ) {
html = wp.media.string.video( props );
html = wp.media.string.video( props, attachment );
} else if ( 'audio' === attachment.type ) {
html = wp.media.string.audio( props );
html = wp.media.string.audio( props, attachment );
} else {
html = wp.media.string.link( props );
options.post_title = props.title;