Changeset 31589

Timestamp:

02/28/2015 08:07:45 PM (12 years ago)

Author:

azaozz

Message:

PressThis:

• Remove unneeded passing of post formats strings to JS.
• Set the currently selected post format name with jQuery.

See #31373.

Location:

trunk/src/wp-admin

Files:

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

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

@@ -32 +32 @@
          */
         public function site_settings() {
-                $supported_formats = get_theme_support( 'post-formats' );
-                $post_formats      = array();
-
-                if ( ! empty( $supported_formats[0] ) && is_array( $supported_formats[0] ) ) {
-                        $post_formats[0] = __( 'Standard' );
-                        foreach ( $supported_formats[0] as $post_format ) {
-                                $post_formats[ $post_format ] = esc_html( get_post_format_string( $post_format ) );
-                        }
-                }
-
                 return array(
-                        'version'         => 5,
-                        'post_formats'    => $post_formats,
+                        // Used to trigger the bookmarklet update notice.
+                        // Needs to be set here and in get_shortcut_link() in wp-includes/link-template.php.
+                        'version' => '5',
 
                         /**

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

@@ -526 +526 @@
 
                 /**
-                 * Adds the currently selected post format next to the option, in the options panel.
-                 *
-                 * @param format string Post format to be displayed
-                 */
-                function setPostFormatString( format ) {
-                        if ( ! format || ! siteConfig || ! siteConfig.post_formats || ! siteConfig.post_formats[ format ] ) {
-                                return;
-                        }
-                        $( '#post-option-post-format' ).text( siteConfig.post_formats[ format ] );
-                }
-
-                /**
                  * Save a new user-generated category via AJAX
                  */
@@ -954 +942 @@
 
                                 if ( $this.is( ':checked' ) ) {
-                                        setPostFormatString( $this.attr( 'id' ).replace( /^post-format-(.+)$/, '$1' ) );
+                                        $( '#post-option-post-format' ).text( $( 'label[for="' + $this.attr( 'id' ) + '"]' ).text() || '' );
                                 }
                         } );