Revert editing of video embed parameters in the media modal, [31620] and [31626] for now. Plan on revisiting in 4.3.
Props iseulde. Fixes #31139, fixes #32006. Built from https://develop.svn.wordpress.org/trunk@32258 git-svn-id: http://core.svn.wordpress.org/trunk@32229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
parent
bafd7b98f6
commit
60706015e1
|
|
@ -2714,21 +2714,14 @@ function wp_ajax_parse_embed() {
|
|||
}
|
||||
|
||||
$shortcode = wp_unslash( $_POST['shortcode'] );
|
||||
|
||||
preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
|
||||
$atts = shortcode_parse_atts( $matches[3] );
|
||||
if ( ! empty( $matches[5] ) ) {
|
||||
$url = $matches[5];
|
||||
} elseif ( ! empty( $atts['src'] ) ) {
|
||||
$url = $atts['src'];
|
||||
}
|
||||
$url = str_replace( '[embed]', '', str_replace( '[/embed]', '', $shortcode ) );
|
||||
|
||||
$parsed = false;
|
||||
setup_postdata( $post );
|
||||
|
||||
$wp_embed->return_false_on_fail = true;
|
||||
|
||||
if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
|
||||
if ( is_ssl() && preg_match( '%^\\[embed[^\\]]*\\]http://%i', $shortcode ) ) {
|
||||
// Admin is ssl and the user pasted non-ssl URL.
|
||||
// Check if the provider supports ssl embeds and use that for the preview.
|
||||
$ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
|
||||
|
|
@ -2781,8 +2774,7 @@ function wp_ajax_parse_embed() {
|
|||
}
|
||||
|
||||
wp_send_json_success( array(
|
||||
'body' => $parsed,
|
||||
'attr' => $wp_embed->last_attr
|
||||
'body' => $parsed
|
||||
) );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ class WP_Embed {
|
|||
public $post_ID;
|
||||
public $usecache = true;
|
||||
public $linkifunknown = true;
|
||||
public $last_attr = array();
|
||||
public $last_url = '';
|
||||
|
||||
/**
|
||||
* When an URL cannot be embedded, return false instead of returning a link
|
||||
|
|
@ -136,18 +134,13 @@ class WP_Embed {
|
|||
$url = $attr['src'];
|
||||
}
|
||||
|
||||
$this->last_url = $url;
|
||||
|
||||
if ( empty( $url ) ) {
|
||||
$this->last_attr = $attr;
|
||||
if ( empty( $url ) )
|
||||
return '';
|
||||
}
|
||||
|
||||
$rawattr = $attr;
|
||||
$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
|
||||
|
||||
$this->last_attr = $attr;
|
||||
|
||||
// kses converts & into & and we need to undo this
|
||||
// See https://core.trac.wordpress.org/ticket/11311
|
||||
$url = str_replace( '&', '&', $url );
|
||||
|
|
|
|||
|
|
@ -1981,29 +1981,6 @@
|
|||
clear: both;
|
||||
}
|
||||
|
||||
.embed-link-settings .setting {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.embed-link-dimensions:after {
|
||||
content: '';
|
||||
display: block;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.embed-link-dimensions .width,
|
||||
.embed-link-dimensions .height {
|
||||
float: right;
|
||||
width: 125px;
|
||||
clear: none;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.embed-link-dimensions input {
|
||||
width: auto;
|
||||
max-width: 110px;
|
||||
}
|
||||
|
||||
.image-details .embed-media-settings .setting {
|
||||
float: none;
|
||||
width: auto;
|
||||
|
|
@ -2050,7 +2027,6 @@
|
|||
.media-embed .setting span {
|
||||
display: block;
|
||||
width: 200px;
|
||||
max-width: 100%;
|
||||
font-size: 13px;
|
||||
line-height: 24px;
|
||||
color: #666;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1981,29 +1981,6 @@
|
|||
clear: both;
|
||||
}
|
||||
|
||||
.embed-link-settings .setting {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.embed-link-dimensions:after {
|
||||
content: '';
|
||||
display: block;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.embed-link-dimensions .width,
|
||||
.embed-link-dimensions .height {
|
||||
float: left;
|
||||
width: 125px;
|
||||
clear: none;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.embed-link-dimensions input {
|
||||
width: auto;
|
||||
max-width: 110px;
|
||||
}
|
||||
|
||||
.image-details .embed-media-settings .setting {
|
||||
float: none;
|
||||
width: auto;
|
||||
|
|
@ -2050,7 +2027,6 @@
|
|||
.media-embed .setting span {
|
||||
display: block;
|
||||
width: 200px;
|
||||
max-width: 100%;
|
||||
font-size: 13px;
|
||||
line-height: 24px;
|
||||
color: #666;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -818,12 +818,11 @@ window.wp = window.wp || {};
|
|||
edit: function( text, update ) {
|
||||
var media = wp.media.embed,
|
||||
frame = media.edit( text, this.url ),
|
||||
self = this,
|
||||
events = 'change:url change:width change:height';
|
||||
self = this;
|
||||
|
||||
this.pausePlayers();
|
||||
|
||||
frame.state( 'embed' ).props.on( events, function( model, url ) {
|
||||
frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
|
||||
if ( url && model.get( 'url' ) ) {
|
||||
frame.state( 'embed' ).metadata = model.toJSON();
|
||||
}
|
||||
|
|
@ -832,7 +831,7 @@ window.wp = window.wp || {};
|
|||
frame.state( 'embed' ).on( 'select', function() {
|
||||
var data = frame.state( 'embed' ).metadata;
|
||||
|
||||
if ( self.url && ! data.width ) {
|
||||
if ( self.url ) {
|
||||
update( data.url );
|
||||
} else {
|
||||
update( media.shortcode( data ).string() );
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4535,7 +4535,7 @@ EmbedLink = wp.media.view.Settings.extend({
|
|||
initialize: function() {
|
||||
this.spinner = $('<span class="spinner" />');
|
||||
this.$el.append( this.spinner[0] );
|
||||
this.listenTo( this.model, 'change:url change:width change:height', this.updateoEmbed );
|
||||
this.listenTo( this.model, 'change:url', this.updateoEmbed );
|
||||
},
|
||||
|
||||
updateoEmbed: _.debounce( function() {
|
||||
|
|
@ -4554,23 +4554,15 @@ EmbedLink = wp.media.view.Settings.extend({
|
|||
}, 600 ),
|
||||
|
||||
fetch: function() {
|
||||
var embed;
|
||||
|
||||
// check if they haven't typed in 500 ms
|
||||
if ( $('#embed-url-field').val() !== this.model.get('url') ) {
|
||||
return;
|
||||
}
|
||||
|
||||
embed = new wp.shortcode({
|
||||
tag: 'embed',
|
||||
attrs: _.pick( this.model.attributes, [ 'width', 'height', 'src' ] ),
|
||||
content: this.model.get('url')
|
||||
});
|
||||
|
||||
wp.ajax.send( 'parse-embed', {
|
||||
data : {
|
||||
post_ID: wp.media.view.settings.post.id,
|
||||
shortcode: embed.string()
|
||||
shortcode: '[embed]' + this.model.get('url') + '[/embed]'
|
||||
}
|
||||
} )
|
||||
.done( _.bind( this.renderoEmbed, this ) )
|
||||
|
|
@ -4578,38 +4570,17 @@ EmbedLink = wp.media.view.Settings.extend({
|
|||
},
|
||||
|
||||
renderFail: function () {
|
||||
this.$( '.setting' ).hide().filter( '.link-text' ).show();
|
||||
this.$( '.link-text' ).show();
|
||||
},
|
||||
|
||||
renderoEmbed: function( response ) {
|
||||
var html = ( response && response.body ) || '',
|
||||
attr = {},
|
||||
opts = { silent: true };
|
||||
var html = ( response && response.body ) || '';
|
||||
|
||||
this.$( '.setting' ).hide()
|
||||
.filter( '.link-text' )[ html ? 'hide' : 'show' ]();
|
||||
|
||||
if ( response && response.attr ) {
|
||||
attr = response.attr;
|
||||
|
||||
_.each( [ 'width', 'height' ], function ( key ) {
|
||||
var $el = this.$( '.setting.' + key ),
|
||||
value = attr[ key ];
|
||||
|
||||
if ( value ) {
|
||||
this.model.set( key, value, opts );
|
||||
$el.show().find( 'input' ).val( value );
|
||||
} else {
|
||||
this.model.unset( key, opts );
|
||||
$el.hide().find( 'input' ).val( '' );
|
||||
}
|
||||
}, this );
|
||||
if ( html ) {
|
||||
this.$('.embed-container').show().find('.embed-preview').html( html );
|
||||
} else {
|
||||
this.model.unset( 'height', opts );
|
||||
this.model.unset( 'width', opts );
|
||||
this.renderFail();
|
||||
}
|
||||
|
||||
this.$('.embed-container').show().find('.embed-preview').html( html );
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -819,16 +819,6 @@ function wp_print_media_templates() {
|
|||
<div class="embed-container" style="display: none;">
|
||||
<div class="embed-preview"></div>
|
||||
</div>
|
||||
<div class="embed-link-dimensions">
|
||||
<label class="setting width">
|
||||
<span><?php _e( 'Maximum Width' ); ?></span>
|
||||
<input type="text" class="alignment" data-setting="width" />
|
||||
</label>
|
||||
<label class="setting height">
|
||||
<span><?php _e( 'Maximum Height' ); ?></span>
|
||||
<input type="text" class="alignment" data-setting="height" />
|
||||
</label>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="tmpl-embed-image-settings">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.2-RC3-32257';
|
||||
$wp_version = '4.2-RC3-32258';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue