Changeset 31601

Timestamp:

03/02/2015 11:40:13 PM (10 years ago)

Author:

azaozz

Message:

Press This:

• Remove classes from suggested HTML for the editor.
• Improve the filter, pass an associative array as param.
• Use <em> instead of <cite>.

Props Michael-Arestad, kraftbj. Fixes #31493.

Location:

trunk/src/wp-admin

Files:

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

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

@@ -32 +32 @@
      */
     public function site_settings() {
-        $html = '<p class="press-this-suggested-source">' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
-            ' <cite><a href="%1$s">%2$s</a></cite></p>';
+        $default_html = array(
+            'quote' => '<blockquote>%1$s</blockquote>',
+            'link' => '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+                ' <em><a href="%1$s">%2$s</a></em></p>',
+        );
 
         return array(
@@ -50 +53 @@
 
             /**
-             * Filter the HTML for the Press This source attribution.
+             * Filter the default HTML for the Press This editor.
              *
              * @since 4.2.0
              *
-             * @param string $html Default HTML, %1$s is link href, %2$s is link text.
+             * @param array $default_html Associative array with two keys: 'quote' where %1$s is replaced with the site description
+             *                            or the selected content, and 'link' there %1$s is link href, %2$s is link text.
              */
-            'suggestedHTML' => apply_filters( 'press_this_suggested_html', $html ),
+            'html' => apply_filters( 'press_this_suggested_html', $default_html ),
         );
     }

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

@@ -201 +201 @@
             }
 
-            if ( text ) {
-                text = sanitizeText( text );
-                // Wrap suggested content in blockquote tag.
-                content = '<blockquote class="press-this-suggested-content">' + text + '</blockquote>';
+            if ( text && siteConfig.html.quote ) {
+                // Wrap suggested content in specified HTML.
+                content = siteConfig.html.quote.replace( /%1\$s/g, sanitizeText( text ) );
             }
 
             // Add a source attribution if there is one available.
-            if ( url && siteConfig.suggestedHTML && ( ( title && __( 'newPost' ) !== title ) || siteName ) ) {
-                content += siteConfig.suggestedHTML.replace( /%1\$s/g, encodeURI( url ) ).replace( /%2\$s/g, ( title || siteName ) );
+            if ( url && siteConfig.html.link && ( ( title && __( 'newPost' ) !== title ) || siteName ) ) {
+                content += siteConfig.html.link.replace( /%1\$s/g, encodeURI( url ) ).replace( /%2\$s/g, ( title || siteName ) );
             }