Changeset 28992

Timestamp:

07/04/2014 02:17:22 AM (11 years ago)

Author:

wonderboymusic

Message:

Make a new file: media-grid.js. This will be way more useful in later commits and help reduce churn and bloat in media-views.js.

See #24716.

Location:

trunk/src

Files:

• wp-admin/upload.php (modified) (1 diff)
• wp-includes/js/media-grid.js (added)
• wp-includes/js/media-views.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/upload.php

@@ -23 +23 @@
 if ( 'grid' === $mode ) {
     wp_enqueue_media();
+    wp_enqueue_script( 'media-grid' );
     wp_enqueue_script( 'media' );
+    
     require_once( ABSPATH . 'wp-admin/admin-header.php' );
     ?><div class="view-switch media-grid-view-switch">

trunk/src/wp-includes/js/media-views.js

@@ -1953 +1953 @@
             return this;
         };
-    });
-
-    /**
-     * wp.media.view.MediaFrame.Manage
-     *
-     * A generic management frame workflow.
-     *
-     * Used in the media grid view.
-     *
-     * @constructor
-     * @augments wp.media.view.MediaFrame
-     * @augments wp.media.view.Frame
-     * @augments wp.media.View
-     * @augments wp.Backbone.View
-     * @augments Backbone.View
-     * @mixes wp.media.controller.StateMachine
-     */
-    media.view.MediaFrame.Manage = media.view.MediaFrame.extend({
-        /**
-         * @global wp.Uploader
-         */
-        initialize: function() {
-            _.defaults( this.options, {
-                title:     l10n.mediaLibraryTitle,
-                modal:     false,
-                selection: [],
-                library:   {},
-                multiple:  false,
-                state:     'library',
-                uploader:  true
-            });
-
-            // Ensure core and media grid view UI is enabled.
-            this.$el.addClass('wp-core-ui media-grid-view');
-
-            // Force the uploader off if the upload limit has been exceeded or
-            // if the browser isn't supported.
-            if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
-                this.options.uploader = false;
-            }
-
-            // Initialize a window-wide uploader.
-            if ( this.options.uploader ) {
-                this.uploader = new media.view.UploaderWindow({
-                    controller: this,
-                    uploader: {
-                        dropzone:  $('body'),
-                        container: $('body')
-                    }
-                }).render();
-                this.uploader.ready();
-                $('body').append( this.uploader.el );
-
-                this.options.uploader = false;
-            }
-
-            /**
-             * call 'initialize' directly on the parent class
-             */
-            media.view.MediaFrame.prototype.initialize.apply( this, arguments );
-
-            // Since we're not using the default modal built into
-            // a media frame, append our $element to the supplied container.
-            this.$el.appendTo( this.options.container );
-
-            this.createSelection();
-            this.createStates();
-            this.bindHandlers();
-            this.render();
-        },
-
-        createSelection: function() {
-            var selection = this.options.selection;
-
-            if ( ! (selection instanceof media.model.Selection) ) {
-                this.options.selection = new media.model.Selection( selection, {
-                    multiple: this.options.multiple
-                });
-            }
-
-            this._selection = {
-                attachments: new media.model.Attachments(),
-                difference: []
-            };
-        },
-
-        createStates: function() {
-            var options = this.options;
-
-            if ( this.options.states ) {
-                return;
-            }
-
-            // Add the default states.
-            this.states.add([
-                new media.controller.Library({
-                    library:    media.query( options.library ),
-                    multiple:   options.multiple,
-                    title:      options.title,
-                    priority:   20,
-                    toolbar:    false,
-                    router:     false,
-                    content:    'browse',
-                    filterable: 'mime-types'
-                }),
-
-                new media.controller.EditImage( { model: options.editImage } )
-            ]);
-        },
-
-        bindHandlers: function() {
-            this.on( 'content:create:browse', this.browseContent, this );
-            this.on( 'content:render:edit-image', this.editImageContent, this );
-        },
-
-        /**
-         * Content
-         *
-         * @param {Object} content
-         * @this wp.media.controller.Region
-         */
-        browseContent: function( content ) {
-            var state = this.state();
-
-            // Browse our library of attachments.
-            content.view = new media.view.AttachmentsBrowser({
-                controller: this,
-                collection: state.get('library'),
-                selection:  state.get('selection'),
-                model:      state,
-                sortable:   state.get('sortable'),
-                search:     state.get('searchable'),
-                filters:    state.get('filterable'),
-                display:    state.get('displaySettings'),
-                dragInfo:   state.get('dragInfo'),
-                bulkEdit:   true,
-
-                suggestedWidth:  state.get('suggestedWidth'),
-                suggestedHeight: state.get('suggestedHeight'),
-
-                AttachmentView: state.get('AttachmentView')
-            });
-        },
-
-        editImageContent: function() {
-            var image = this.state().get('image'),
-                view = new media.view.EditImage( { model: image, controller: this } ).render();
-
-            this.content.set( view );
-
-            // after creating the wrapper view, load the actual editor via an ajax call
-            view.loadEditor();
-
-        }
     });
 

trunk/src/wp-includes/script-loader.php

@@ -507 +507 @@
 
         $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
-
+        
+        $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(