<!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>[29066] trunk/src/wp-includes/js: Media Grid, remove unnecessary abstraction: `wp.media.controller._State`</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/29066">29066</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 16:01:49 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid, remove unnecessary abstraction: `wp.media.controller._State`
Props ericlewis.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29065 => 29066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-10 15:55:21 UTC (rev 29065)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-10 16:01:49 UTC (rev 29066)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> * @augments wp.media.controller.State
</span><span class="cx"> * @augments Backbone.Model
</span><span class="cx"> */
</span><del>- media.controller.EditImageNoFrame = media.controller._State.extend({
</del><ins>+ media.controller.EditImageNoFrame = media.controller.State.extend({
</ins><span class="cx"> defaults: {
</span><span class="cx"> id: 'edit-attachment',
</span><span class="cx"> title: l10n.editImage,
</span><span class="lines">@@ -29,19 +29,17 @@
</span><span class="cx"> url: ''
</span><span class="cx"> },
</span><span class="cx">
</span><del>- initialize: function() {
- media.controller._State.prototype.initialize.apply( this, arguments );
- },
</del><ins>+ _ready: function() {},
</ins><span class="cx">
</span><ins>+ /**
+ * Override media.controller.State._postActivate, since this state doesn't
+ * include the regions expected there.
+ */
</ins><span class="cx"> _postActivate: function() {
</span><span class="cx"> this._content();
</span><span class="cx"> this._router();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- deactivate: function() {
- this.stopListening( this.frame );
- },
-
</del><span class="cx"> /**
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29065 => 29066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-10 15:55:21 UTC (rev 29065)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-10 16:01:49 UTC (rev 29066)
</span><span class="lines">@@ -337,11 +337,16 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * A more abstracted state, because media.controller.State expects
- * specific regions (menu, title, etc.) to exist on the frame, which do not
- * exist in media.view.Frame.EditAttachment.
</del><ins>+ * wp.media.controller.State
+ *
+ * A state is a step in a workflow that when set will trigger the controllers
+ * for the regions to be updated as specified in the frame. This is the base
+ * class that the various states used in wp.media extend.
+ *
+ * @constructor
+ * @augments Backbone.Model
</ins><span class="cx"> */
</span><del>- media.controller._State = Backbone.Model.extend({
</del><ins>+ media.controller.State = Backbone.Model.extend({
</ins><span class="cx"> constructor: function() {
</span><span class="cx"> this.on( 'activate', this._preActivate, this );
</span><span class="cx"> this.on( 'activate', this.activate, this );
</span><span class="lines">@@ -349,13 +354,14 @@
</span><span class="cx"> this.on( 'deactivate', this._deactivate, this );
</span><span class="cx"> this.on( 'deactivate', this.deactivate, this );
</span><span class="cx"> this.on( 'reset', this.reset, this );
</span><ins>+ this.on( 'ready', this._ready, this );
</ins><span class="cx"> this.on( 'ready', this.ready, this );
</span><span class="cx"> /**
</span><span class="cx"> * Call parent constructor with passed arguments
</span><span class="cx"> */
</span><span class="cx"> Backbone.Model.apply( this, arguments );
</span><ins>+ this.on( 'change:menu', this._updateMenu, this );
</ins><span class="cx"> },
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * @abstract
</span><span class="cx"> */
</span><span class="lines">@@ -375,58 +381,18 @@
</span><span class="cx"> /**
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- _preActivate: function() {
- this.active = true;
</del><ins>+ _ready: function() {
+ this._updateMenu();
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @access private
</span><del>- */
- _postActivate: function() {},
- /**
- * @access private
- */
- _deactivate: function() {
- this.active = false;
- }
- });
-
- /**
- * wp.media.controller.State
- *
- * A state is a step in a workflow that when set will trigger the controllers
- * for the regions to be updated as specified in the frame. This is the base
- * class that the various states used in wp.media extend.
- *
- * @constructor
- * @augments Backbone.Model
- */
- media.controller.State = media.controller._State.extend({
- constructor: function() {
- this.on( 'activate', this._preActivate, this );
- this.on( 'activate', this.activate, this );
- this.on( 'activate', this._postActivate, this );
- this.on( 'deactivate', this._deactivate, this );
- this.on( 'deactivate', this.deactivate, this );
- this.on( 'reset', this.reset, this );
- this.on( 'ready', this._ready, this );
- this.on( 'ready', this.ready, this );
- /**
- * Call parent constructor with passed arguments
- */
- Backbone.Model.apply( this, arguments );
- this.on( 'change:menu', this._updateMenu, this );
</del><ins>+ */
+ _preActivate: function() {
+ this.active = true;
</ins><span class="cx"> },
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- _ready: function() {
- this._updateMenu();
- },
-
- /**
- * @access private
- */
</del><span class="cx"> _postActivate: function() {
</span><span class="cx"> this.on( 'change:menu', this._menu, this );
</span><span class="cx"> this.on( 'change:titleMode', this._title, this );
</span></span></pre>
</div>
</div>
</body>
</html>