Changeset 31868

Timestamp:

03/24/2015 01:32:17 AM (11 years ago)

Author:

azaozz

Message:

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.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-press-this.php (modified) (1 diff)
• js/press-this.js (modified) (6 diffs)

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -1081 +1081 @@
                 $site_data = array(
                         'v' => ! empty( $data['v'] ) ? $data['v'] : '',
+                        'u' => ! empty( $data['u'] ) ? $data['u'] : '',
                         'hasData' => ! empty( $data ),
                 );

trunk/src/wp-admin/js/press-this.js

@@ -195 +195 @@
                  * @param link string Optional destination link, for images (defaults to src)
                  */
-                function insertSelectedMedia( type, src, link ) {
-                        var newContent = '';
+                function insertSelectedMedia( $element ) {
+                        var src, link, newContent = '';
 
                         if ( ! editor ) {
@@ -202 +202 @@
                         }
 
-                        src = checkUrl( src );
-                        link = checkUrl( link );
-
-                        if ( 'img' === type ) {
+                        src = checkUrl( $element.attr( 'data-wp-src' ) || '' );
+                        link = checkUrl( data.u );
+
+                        if ( $element.hasClass( 'is-image' ) ) {
                                 if ( ! link ) {
                                         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 {
-                                newContent = '[embed]' + src + '[/embed]\n';
+                                newContent = '[embed]' + src + '[/embed]';
                         }
 
                         if ( ! hasSetFocus ) {
-                                editor.focus();
-                        }
-
-                        editor.execCommand( 'mceInsertContent', false, newContent );
-                        hasSetFocus = true;
+                                editor.setContent( '<p>' + newContent + '</p>' + editor.getContent() );
+                        } else {
+                                editor.execCommand( 'mceInsertContent', false, newContent );
+                        }
                 }
 
@@ -335 +334 @@
                         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 ) );
 
-                        $element.on( 'click keypress', function ( event ) {
-                                if ( event.type === 'click' || event.keyCode === 13 ) {
-                                        insertSelectedMedia( 'img', src, data.u );
-                                }
-                        } ).appendTo( $mediaList );
+                        $mediaList.append( $element );
                 }
 
@@ -379 +374 @@
                                         }
 
-                                        $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 ) {
@@ -385 +380 @@
                                         }
 
-                                        $element.on( 'click keypress', function ( event ) {
-                                                if ( event.type === 'click' || event.keyCode === 13 ) {
-                                                        insertSelectedMedia( 'embed', src );
-                                                }
-                                        } ).appendTo( $mediaList );
-
+                                        $mediaList.append( $element );
                                         found++;
                                 } );
@@ -580 +570 @@
                                         hasSetFocus = true;
                                 } );
+                        }).on( 'click.press-this keypress.press-this', '.suggested-media-thumbnail', function( event ) {
+                                if ( event.type === 'click' || event.keyCode === 13 ) {
+                                        insertSelectedMedia( $( this ) );
+                                }
                         });