Changeset 33075

Timestamp:

07/03/2015 09:27:06 PM (9 years ago)

Author:

obenland

Message:

Site Icon: Remove date dropdown from media modal.

This also allows us to leverage the builtin suggestedWidth and
suggestedHeight parameters to convey the expected image size.

Props ocean90.
Fixes #32860.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-site-icon.php (modified) (1 diff)
• js/site-icon.js (modified) (3 diffs)
• options-general.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -177 +177 @@
         <p class="hide-if-no-js">
             <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-            <button type="button" id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+            <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $this->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
         </p>
         <form class="hide-if-js" action="<?php echo esc_url( admin_url( 'options-general.php?page=site-icon' ) ); ?>" method="post" enctype="multipart/form-data">

trunk/src/wp-admin/js/site-icon.js

@@ -4 +4 @@
     $( function() {
         // Build the choose from library frame.
-        $( '#choose-from-library-link' ).click( function( event ) {
+        $( '#choose-from-library-link' ).on( 'click', function( event ) {
             var $el = $(this);
             event.preventDefault();
@@ -15 +15 @@
 
             // Create the media frame.
-            frame = wp.media.frames.customHeader = wp.media({
-                // Set the title of the modal.
-                title: $el.data('choose'),
-
-                // Tell the modal to show only images.
-                library: {
-                    type: 'image'
-                },
-
+            frame = wp.media({
                 // Customize the submit button.
                 button: {
@@ -31 +23 @@
                     // going to refresh the page when the image is selected.
                     close: false
-                }
+                },
+                states: [
+                    new wp.media.controller.Library({
+                        title: $el.data( 'choose' ),
+                        library: wp.media.query({ type: 'image' }),
+                        date: false,
+                        suggestedWidth: $el.data( 'size' ),
+                        suggestedHeight: $el.data( 'size' )
+                    })
+                ]
             });
 

trunk/src/wp-admin/options-general.php

@@ -147 +147 @@
     <p class="hide-if-no-js">
         <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-        <button type="button" id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Update Site Icon' ); ?></button>
+        <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Update Site Icon' ); ?></button>
         <a href="<?php echo esc_url( $remove_url ); ?>"><?php _e( 'Remove Site Icon' ); ?></a>
     </p>
@@ -159 +159 @@
     <p class="hide-if-no-js">
         <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-        <button type="button" id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+        <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
     </p>
     <a class="button hide-if-js" href="<?php echo esc_url( $upload_url ); ?>"><?php _e( 'Add a Site Icon' ); ?></a>