<!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>[22802] trunk/wp-includes/js/media-views.js: Media: Make priority list views leverage the subview management class.</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/22802">22802</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-22 00:41:39 +0000 (Thu, 22 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Make priority list views leverage the subview management class. 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 (22801 => 22802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 22:58:36 UTC (rev 22801)
+++ trunk/wp-includes/js/media-views.js 2012-11-22 00:41:39 UTC (rev 22802)
</span><span class="lines">@@ -680,10 +680,12 @@
</span><span class="cx">
</span><span class="cx"> if ( existing ) {
</span><span class="cx"> if ( options.add ) {
</span><del>- if ( _.isUndefined( options.at ) )
</del><ins>+ if ( _.isUndefined( options.at ) ) {
</ins><span class="cx"> next = existing.concat( views );
</span><del>- else
- next = existing.splice.apply( existing, [ options.at, 0 ].concat( views ) );
</del><ins>+ } else {
+ next = existing;
+ next.splice.apply( next, [ options.at, 0 ].concat( views ) );
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> _.each( next, function( view ) {
</span><span class="cx"> view.__detach = true;
</span><span class="lines">@@ -736,6 +738,12 @@
</span><span class="cx"> //
</span><span class="cx"> // For more information on the `options` object, see `Views.set()`.
</span><span class="cx"> add: function( selector, views, options ) {
</span><ins>+ if ( ! _.isString( selector ) ) {
+ options = views;
+ views = selector;
+ selector = '';
+ }
+
</ins><span class="cx"> return this.set( selector, views, _.extend({ add: true }, options ) );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -2184,42 +2192,22 @@
</span><span class="cx"> this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
</span><span class="cx"> delete this.options.views;
</span><span class="cx">
</span><del>- if ( ! this.options.silent )
</del><ins>+ // if ( ! this.options.silent )
</ins><span class="cx"> this.render();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- destroy: function() {
- this.remove();
- _.each( this._views, function( view ) {
- if ( view.destroy )
- view.destroy();
- });
- },
</del><ins>+ destroy: this.dispose,
</ins><span class="cx">
</span><del>- render: function() {
- var els = _( this._views ).chain().sortBy( function( view ) {
- return view.options.priority || 10;
- }).pluck('el').value();
</del><ins>+ set: function( id, view, options ) {
+ var priority, views, index;
</ins><span class="cx">
</span><del>- // Make sure to detach the elements we want to reuse.
- // Otherwise, `jQuery.html()` will unbind their events.
- $( els ).detach();
-
- this.$el.html( els );
- return this;
- },
-
- set: function( id, view, options ) {
</del><span class="cx"> options = options || {};
</span><span class="cx">
</span><span class="cx"> // Accept an object with an `id` : `view` mapping.
</span><span class="cx"> if ( _.isObject( id ) ) {
</span><span class="cx"> _.each( id, function( view, id ) {
</span><del>- this.set( id, view, { silent: true });
</del><ins>+ this.set( id, view );
</ins><span class="cx"> }, this );
</span><del>-
- if ( ! options.silent )
- this.render();
</del><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2228,9 +2216,23 @@
</span><span class="cx">
</span><span class="cx"> view.controller = view.controller || this.controller;
</span><span class="cx">
</span><ins>+ this.unset( id );
+
+ priority = view.options.priority || 10;
+ views = this.views.get() || [];
+
+ _.find( views, function( existing, i ) {
+ if ( existing.options.priority > priority ) {
+ index = i;
+ return true;
+ }
+ });
+
</ins><span class="cx"> this._views[ id ] = view;
</span><del>- if ( ! options.silent )
- this.render();
</del><ins>+ this.views.add( view, {
+ at: _.isNumber( index ) ? index : views.length || 0
+ });
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -2238,10 +2240,12 @@
</span><span class="cx"> return this._views[ id ];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- unset: function( id, options ) {
</del><ins>+ unset: function( id ) {
+ var view = this.get( id );
+ if ( view )
+ view.dispose();
+
</ins><span class="cx"> delete this._views[ id ];
</span><del>- if ( ! options || ! options.silent )
- this.render();
</del><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>