<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28992] trunk/src: Make a new file: `media-grid.js`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28992">28992</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-04 02:17:22 +0000 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (28991 => 28992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php 2014-07-04 02:05:22 UTC (rev 28991)
+++ trunk/src/wp-admin/upload.php 2014-07-04 02:17:22 UTC (rev 28992)
</span><span class="lines">@@ -22,7 +22,9 @@
</span><span class="cx">
</span><span class="cx"> if ( 'grid' === $mode ) {
</span><span class="cx"> wp_enqueue_media();
</span><ins>+ wp_enqueue_script( 'media-grid' );
</ins><span class="cx"> wp_enqueue_script( 'media' );
</span><ins>+
</ins><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> ?><div class="view-switch media-grid-view-switch">
</span><span class="cx"> <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-list">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="addfile"><h4>Added: trunk/src/wp-includes/js/media-grid.js (0 => 28992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js (rev 0)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-04 02:17:22 UTC (rev 28992)
</span><span class="lines">@@ -0,0 +1,166 @@
</span><ins>+(function( $, _, Backbone, wp ) {
+ var media = wp.media, l10n;
+
+ // Link any localized strings.
+ if ( media.view.l10n ) {
+ l10n = media.view.l10n;
+ } else {
+ l10n = media.view.l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
+ delete l10n.settings;
+ }
+
+ /**
+ * 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();
+
+ }
+ });
+
+}( jQuery, _, Backbone, wp ));
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (28991 => 28992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-04 02:05:22 UTC (rev 28991)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-04 02:17:22 UTC (rev 28992)
</span><span class="lines">@@ -1955,160 +1955,6 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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();
-
- }
- });
-
- /**
</del><span class="cx"> * wp.media.view.MediaFrame.Select
</span><span class="cx"> *
</span><span class="cx"> * Type of media frame that is used to select an item or items from the media library
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/script-loader.php (28991 => 28992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/script-loader.php 2014-07-04 02:05:22 UTC (rev 28991)
+++ trunk/src/wp-includes/script-loader.php 2014-07-04 02:17:22 UTC (rev 28992)
</span><span class="lines">@@ -506,7 +506,8 @@
</span><span class="cx"> $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
</span><del>-
</del><ins>+
+ $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
</ins><span class="cx"> $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
</span><span class="cx"> did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(
</span><span class="cx"> 'error' => __( 'An error has occurred. Please reload the page and try again.' ),
</span></span></pre>
</div>
</div>
</body>
</html>