WordPress.org

Make WordPress Core

Changeset 33075


Ignore:
Timestamp:
07/03/2015 09:27:06 PM (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/class-wp-site-icon.php

    r33053 r33075  
    177177        <p class="hide-if-no-js">
    178178            <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
    179             <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>
     179            <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>
    180180        </p>
    181181        <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

    r32994 r33075  
    44    $( function() {
    55        // Build the choose from library frame.
    6         $( '#choose-from-library-link' ).click( function( event ) {
     6        $( '#choose-from-library-link' ).on( 'click', function( event ) {
    77            var $el = $(this);
    88            event.preventDefault();
     
    1515
    1616            // Create the media frame.
    17             frame = wp.media.frames.customHeader = wp.media({
    18                 // Set the title of the modal.
    19                 title: $el.data('choose'),
    20 
    21                 // Tell the modal to show only images.
    22                 library: {
    23                     type: 'image'
    24                 },
    25 
     17            frame = wp.media({
    2618                // Customize the submit button.
    2719                button: {
     
    3123                    // going to refresh the page when the image is selected.
    3224                    close: false
    33                 }
     25                },
     26                states: [
     27                    new wp.media.controller.Library({
     28                        title: $el.data( 'choose' ),
     29                        library: wp.media.query({ type: 'image' }),
     30                        date: false,
     31                        suggestedWidth: $el.data( 'size' ),
     32                        suggestedHeight: $el.data( 'size' )
     33                    })
     34                ]
    3435            });
    3536
  • trunk/src/wp-admin/options-general.php

    r32994 r33075  
    147147    <p class="hide-if-no-js">
    148148        <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
    149         <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>
     149        <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>
    150150        <a href="<?php echo esc_url( $remove_url ); ?>"><?php _e( 'Remove Site Icon' ); ?></a>
    151151    </p>
     
    159159    <p class="hide-if-no-js">
    160160        <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
    161         <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>
     161        <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>
    162162    </p>
    163163    <a class="button hide-if-js" href="<?php echo esc_url( $upload_url ); ?>"><?php _e( 'Add a Site Icon' ); ?></a>
Note: See TracChangeset for help on using the changeset viewer.