Press This:
- Fix the links on inserted images to point to the source site. - Fix inserting of images above the blockquote when the editor has not been focused. Fixes #31745. git-svn-id: https://develop.svn.wordpress.org/trunk@31868 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
fc1d327261
commit
defa8b0f96
|
@ -1080,6 +1080,7 @@ class WP_Press_This {
|
||||||
|
|
||||||
$site_data = array(
|
$site_data = array(
|
||||||
'v' => ! empty( $data['v'] ) ? $data['v'] : '',
|
'v' => ! empty( $data['v'] ) ? $data['v'] : '',
|
||||||
|
'u' => ! empty( $data['u'] ) ? $data['u'] : '',
|
||||||
'hasData' => ! empty( $data ),
|
'hasData' => ! empty( $data ),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -194,32 +194,31 @@
|
||||||
* @param src string Source URL
|
* @param src string Source URL
|
||||||
* @param link string Optional destination link, for images (defaults to src)
|
* @param link string Optional destination link, for images (defaults to src)
|
||||||
*/
|
*/
|
||||||
function insertSelectedMedia( type, src, link ) {
|
function insertSelectedMedia( $element ) {
|
||||||
var newContent = '';
|
var src, link, newContent = '';
|
||||||
|
|
||||||
if ( ! editor ) {
|
if ( ! editor ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
src = checkUrl( src );
|
src = checkUrl( $element.attr( 'data-wp-src' ) || '' );
|
||||||
link = checkUrl( link );
|
link = checkUrl( data.u );
|
||||||
|
|
||||||
if ( 'img' === type ) {
|
if ( $element.hasClass( 'is-image' ) ) {
|
||||||
if ( ! link ) {
|
if ( ! link ) {
|
||||||
link = src;
|
link = src;
|
||||||
}
|
}
|
||||||
|
|
||||||
newContent = '<a href="' + link + '"><img class="alignnone size-full" src="' + src + '" /></a>\n';
|
newContent = '<a href="' + link + '"><img class="alignnone size-full" src="' + src + '" /></a>';
|
||||||
} else {
|
} else {
|
||||||
newContent = '[embed]' + src + '[/embed]\n';
|
newContent = '[embed]' + src + '[/embed]';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! hasSetFocus ) {
|
if ( ! hasSetFocus ) {
|
||||||
editor.focus();
|
editor.setContent( '<p>' + newContent + '</p>' + editor.getContent() );
|
||||||
|
} else {
|
||||||
|
editor.execCommand( 'mceInsertContent', false, newContent );
|
||||||
}
|
}
|
||||||
|
|
||||||
editor.execCommand( 'mceInsertContent', false, newContent );
|
|
||||||
hasSetFocus = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -334,14 +333,10 @@
|
||||||
function addImg( src, displaySrc, i ) {
|
function addImg( src, displaySrc, i ) {
|
||||||
var $element = $mediaThumbWrap.clone().addClass( 'is-image' );
|
var $element = $mediaThumbWrap.clone().addClass( 'is-image' );
|
||||||
|
|
||||||
$element.css( 'background-image', 'url(' + displaySrc + ')' )
|
$element.attr( 'data-wp-src', src ).css( 'background-image', 'url(' + displaySrc + ')' )
|
||||||
.find( 'span' ).text( __( 'suggestedImgAlt' ).replace( '%d', i + 1 ) );
|
.find( 'span' ).text( __( 'suggestedImgAlt' ).replace( '%d', i + 1 ) );
|
||||||
|
|
||||||
$element.on( 'click keypress', function ( event ) {
|
$mediaList.append( $element );
|
||||||
if ( event.type === 'click' || event.keyCode === 13 ) {
|
|
||||||
insertSelectedMedia( 'img', src, data.u );
|
|
||||||
}
|
|
||||||
} ).appendTo( $mediaList );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -378,18 +373,13 @@
|
||||||
cssClass += ' is-video';
|
cssClass += ' is-video';
|
||||||
}
|
}
|
||||||
|
|
||||||
$element.find( 'span' ).text( __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) );
|
$element.attr( 'data-wp-src', src ).find( 'span' ).text( __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) );
|
||||||
|
|
||||||
if ( displaySrc ) {
|
if ( displaySrc ) {
|
||||||
$element.css( 'background-image', 'url(' + displaySrc + ')' );
|
$element.css( 'background-image', 'url(' + displaySrc + ')' );
|
||||||
}
|
}
|
||||||
|
|
||||||
$element.on( 'click keypress', function ( event ) {
|
$mediaList.append( $element );
|
||||||
if ( event.type === 'click' || event.keyCode === 13 ) {
|
|
||||||
insertSelectedMedia( 'embed', src );
|
|
||||||
}
|
|
||||||
} ).appendTo( $mediaList );
|
|
||||||
|
|
||||||
found++;
|
found++;
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
@ -579,6 +569,10 @@
|
||||||
ed.on( 'focus', function() {
|
ed.on( 'focus', function() {
|
||||||
hasSetFocus = true;
|
hasSetFocus = true;
|
||||||
} );
|
} );
|
||||||
|
}).on( 'click.press-this keypress.press-this', '.suggested-media-thumbnail', function( event ) {
|
||||||
|
if ( event.type === 'click' || event.keyCode === 13 ) {
|
||||||
|
insertSelectedMedia( $( this ) );
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Publish, Draft and Preview buttons
|
// Publish, Draft and Preview buttons
|
||||||
|
|
Loading…
Reference in New Issue