<!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>[22397] trunk/wp-includes/js/media-views.js: Media JS: Move state-related logic from sidebar views to the state controllers.</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, #logmsg > ol { margin-left: 0; 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/22397">22397</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-06 01:19:39 +0000 (Tue, 06 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Move state-related logic from sidebar views to the state controllers. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22396 => 22397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-06 01:01:52 UTC (rev 22396)
+++ trunk/wp-includes/js/media-views.js 2012-11-06 01:19:39 UTC (rev 22397)
</span><span class="lines">@@ -184,13 +184,16 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> activate: function() {
</span><ins>+ var selection = this.get('selection');
+
</ins><span class="cx"> // If we're in a workflow that supports multiple attachments,
</span><span class="cx"> // automatically select any uploading attachments.
</span><span class="cx"> if ( this.get('multiple') )
</span><span class="cx"> wp.Uploader.queue.on( 'add', this.selectUpload, this );
</span><span class="cx">
</span><del>- this.get('selection').on( 'selection:single', this.buildDetails, this );
- this.get('selection').on( 'selection:unsingle', this.clearDetails, this );
</del><ins>+ selection.on( 'selection:single', this.buildDetails, this );
+ selection.on( 'selection:unsingle', this.clearDetails, this );
+ selection.on( 'add remove reset', this.updateToolbarVisibility, this );
</ins><span class="cx">
</span><span class="cx"> this._updateEmpty();
</span><span class="cx"> this.get('library').on( 'add remove reset', this._updateEmpty, this );
</span><span class="lines">@@ -199,30 +202,21 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> deactivate: function() {
</span><del>- var toolbar = this._postLibraryToolbar;
-
- if ( toolbar )
- this.get('selection').off( 'add remove', toolbar.visibility, toolbar );
-
</del><span class="cx"> wp.Uploader.queue.off( 'add', this.selectUpload, this );
</span><del>- this.get('selection').off( 'selection:single', this.buildDetails, this );
- this.get('selection').off( 'selection:unsingle', this.clearDetails, this );
</del><ins>+
+ // Unbind all event handlers that use this state as the context
+ // from the selection.
+ this.get('selection').off( null, null, this );
</ins><span class="cx"> this.get('library').off( 'add remove reset', this._updateEmpty, this );
</span><span class="cx"> this.off( 'change:empty', this.refresh, this );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toolbar: function() {
</span><del>- var frame = this.frame,
- toolbar;
</del><ins>+ var frame = this.frame;
</ins><span class="cx">
</span><del>- // Toolbar.
- toolbar = this._postLibraryToolbar = new media.view.Toolbar.PostLibrary({
- controller: frame,
- state: this
- });
-
- frame.toolbar( toolbar );
- this.get('selection').on( 'add remove', toolbar.visibility, toolbar );
</del><ins>+ frame.toolbar( new media.view.Toolbar.PostLibrary({
+ controller: frame
+ }) );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> sidebar: function() {
</span><span class="lines">@@ -271,6 +265,10 @@
</span><span class="cx"> this.set( 'empty', ! this.get('library').length );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateToolbarVisibility: function() {
+ this.frame.toolbar().visibility();
+ },
+
</ins><span class="cx"> selectUpload: function( attachment ) {
</span><span class="cx"> this.get('selection').add( attachment );
</span><span class="cx"> },
</span><span class="lines">@@ -357,9 +355,9 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toolbar: function() {
</span><del>- this.frame.toolbar( new media.view.Toolbar.Gallery({
- controller: this.frame,
- state: this
</del><ins>+ var frame = this.frame;
+ frame.toolbar( new media.view.Toolbar.Gallery({
+ controller: frame
</ins><span class="cx"> }) );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -408,10 +406,8 @@
</span><span class="cx">
</span><span class="cx"> toolbar: function() {
</span><span class="cx"> var frame = this.frame;
</span><del>-
</del><span class="cx"> frame.toolbar( new media.view.Toolbar.GalleryAddImages({
</span><del>- controller: frame,
- state: this
</del><ins>+ controller: frame
</ins><span class="cx"> }) );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -872,9 +868,8 @@
</span><span class="cx"> // ---------------------------------
</span><span class="cx"> media.view.Toolbar.PostLibrary = media.view.Toolbar.extend({
</span><span class="cx"> initialize: function() {
</span><del>- var state = this.options.state,
- selection = state.get('selection'),
- controller = this.options.controller;
</del><ins>+ var controller = this.options.controller,
+ selection = controller.state().get('selection');
</ins><span class="cx">
</span><span class="cx"> this.options.items = {
</span><span class="cx"> selection: new media.view.Selection({
</span><span class="lines">@@ -901,7 +896,7 @@
</span><span class="cx"> text: l10n.insertIntoPost,
</span><span class="cx"> click: function() {
</span><span class="cx"> controller.close();
</span><del>- state.trigger( 'insert', selection );
</del><ins>+ controller.state().trigger( 'insert', selection );
</ins><span class="cx"> selection.clear();
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="lines">@@ -941,9 +936,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> visibility: function() {
</span><del>- var state = this.options.state,
- selection = state.get('selection'),
- controller = this.options.controller,
</del><ins>+ var selection = this.controller.state().get('selection'),
</ins><span class="cx"> count = selection.length,
</span><span class="cx"> showGallery;
</span><span class="cx">
</span><span class="lines">@@ -966,10 +959,10 @@
</span><span class="cx"> // -----------------------------
</span><span class="cx"> media.view.Toolbar.Gallery = media.view.Toolbar.extend({
</span><span class="cx"> initialize: function() {
</span><del>- var state = this.options.state,
</del><ins>+ var controller = this.options.controller,
+ state = controller.state(),
</ins><span class="cx"> editing = state.get('editing'),
</span><del>- library = state.get('library'),
- controller = this.options.controller;
</del><ins>+ library = state.get('library');
</ins><span class="cx">
</span><span class="cx"> this.options.items = {
</span><span class="cx"> update: {
</span><span class="lines">@@ -977,8 +970,9 @@
</span><span class="cx"> text: editing ? l10n.updateGallery : l10n.insertGallery,
</span><span class="cx"> priority: 40,
</span><span class="cx"> click: function() {
</span><ins>+ var state = controller.state();
</ins><span class="cx"> controller.close();
</span><del>- state.trigger( 'update', library );
</del><ins>+ state.trigger( 'update', state.get('library') );
</ins><span class="cx"> controller.get('library').get('selection').clear();
</span><span class="cx"> controller.state('library');
</span><span class="cx"> }
</span><span class="lines">@@ -990,7 +984,7 @@
</span><span class="cx">
</span><span class="cx"> click: function() {
</span><span class="cx"> controller.get('gallery:add').set( 'selection', new media.model.Selection( library.models, {
</span><del>- props: library.props.toJSON(),
</del><ins>+ props: controller.state().get('library').props.toJSON(),
</ins><span class="cx"> multiple: true
</span><span class="cx"> }) );
</span><span class="cx"> controller.state('gallery:add');
</span><span class="lines">@@ -1018,10 +1012,7 @@
</span><span class="cx"> // -----------------------------
</span><span class="cx"> media.view.Toolbar.GalleryAddImages = media.view.Toolbar.extend({
</span><span class="cx"> initialize: function() {
</span><del>- var state = this.options.state,
- editing = state.get('editing'),
- library = state.get('library'),
- controller = this.options.controller;
</del><ins>+ var controller = this.options.controller;
</ins><span class="cx">
</span><span class="cx"> this.options.items = {
</span><span class="cx"> update: {
</span><span class="lines">@@ -1030,7 +1021,7 @@
</span><span class="cx"> priority: 40,
</span><span class="cx">
</span><span class="cx"> click: function() {
</span><del>- controller.get('gallery').set( 'library', state.get('selection') );
</del><ins>+ controller.get('gallery').set( 'library', controller.state().get('selection') );
</ins><span class="cx"> controller.state('gallery');
</span><span class="cx"> }
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>