Changeset 30915

Timestamp:

12/16/2014 07:20:31 PM (12 years ago)

Author:

johnbillion

Message:

Customizer: Remove date filter from the Header/Background Image upload frames.

Adds an option to wp.media.view.AttachmentsBrowser to hide the date filter added in [29813].

Merges [30872] to the 4.1 branch.

See #30689.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-admin/js/customize-controls.js (modified) (2 diffs)
• src/wp-includes/js/media-views.js (modified) (4 diffs)

branches/4.1/src/wp-admin/js/customize-controls.js

@@ -1050 +1050 @@
                 initFrame: function() {
                         this.frame = wp.media({
-                                // The title of the media modal.
-                                title: this.params.button_labels.frame_title,
-
-                                // Restrict the library to specified mime type.
-                                library: {
-                                        type: this.params.mime_type
-                                },
                                 button: {
-                                        // Change the submit button label.
                                         text: this.params.button_labels.frame_button
                                 },
-                                multiple: false
+                                states: [
+                                        new wp.media.controller.Library({
+                                                title:     this.params.button_labels.frame_title,
+                                                library:   wp.media.query({ type: this.params.mime_type }),
+                                                multiple:  false,
+                                                date:      false
+                                        })
+                                ]
                         });
 
@@ -1265 +1264 @@
                                                 library:   wp.media.query({ type: 'image' }),
                                                 multiple:  false,
+                                                date:      false,
                                                 priority:  20,
                                                 suggestedWidth: _wpCustomizeHeader.data.width,

branches/4.1/src/wp-includes/js/media-views.js

@@ -2599 +2599 @@
                                 search:     state.get('searchable'),
                                 filters:    state.get('filterable'),
+                                date:       state.get('date'),
                                 display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
                                 dragInfo:   state.get('dragInfo'),
@@ -6228 +6229 @@
          * @param {object}      [options.search=true]   Whether to show the search interface in the
          *                                              browser's toolbar.
+         * @param {object}      [options.date=true]     Whether to show the date filter in the
+         *                                              browser's toolbar.
          * @param {object}      [options.display=false] Whether to show the attachments display settings
          *                                              view in the sidebar.
@@ -6241 +6244 @@
                                 filters: false,
                                 search:  true,
+                                date:    true,
                                 display: false,
                                 sidebar: true,
@@ -6454 +6458 @@
                                 }
 
-                        } else {
+                        } else if ( this.options.date ) {
                                 // DateFilter is a <select>, screen reader text needs to be rendered before
                                 this.toolbar.set( 'dateFilterLabel', new media.view.Label({