<!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>[22662] trunk/wp-includes/js/media-views.js: Media: Add default render method to views.</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/22662">22662</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-19 06:02:00 +0000 (Mon, 19 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add default render method to views.
* Use default `render` method in the `Frame` view.
* Rename `Views.attach` to `Views.insert`.
* Add `Views.all` to retrieve all subviews.
* Add `Views.detach` to detach all subviews.
* Detect whether views are going to be reused in `View.set` and `detach` them instead of calling `dispose`.
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 (22661 => 22662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-19 04:58:32 UTC (rev 22661)
+++ trunk/wp-includes/js/media-views.js 2012-11-19 06:02:00 UTC (rev 22662)
</span><span class="lines">@@ -574,6 +574,10 @@
</span><span class="cx"> media.Views.extend = Backbone.Model.extend;
</span><span class="cx">
</span><span class="cx"> _.extend( media.Views.prototype, {
</span><ins>+ all: function() {
+ return _.flatten( this._views );
+ },
+
</ins><span class="cx"> get: function( selector ) {
</span><span class="cx"> selector = selector || '';
</span><span class="cx"> return this._views[ selector ];
</span><span class="lines">@@ -592,7 +596,7 @@
</span><span class="cx"> add = options && options.add;
</span><span class="cx"> existing = this.get( selector );
</span><span class="cx"> next = views;
</span><del>- method = add ? 'attach' : 'replace';
</del><ins>+ method = add ? 'insert' : 'replace';
</ins><span class="cx">
</span><span class="cx"> if ( existing ) {
</span><span class="cx"> if ( add ) {
</span><span class="lines">@@ -601,8 +605,20 @@
</span><span class="cx"> else
</span><span class="cx"> next = existing.splice.apply( existing, [ options.at, 0 ].concat( views ) );
</span><span class="cx"> } else {
</span><del>- this.unset( selector );
- _.invoke( existing, 'dispose' );
</del><ins>+ _.each( next, function( view ) {
+ view.__detach = true;
+ });
+
+ _.each( existing, function( view ) {
+ if ( view.__detach )
+ view.$el.detach();
+ else
+ view.dispose();
+ });
+
+ _.each( next, function( view ) {
+ delete view.__detach;
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -634,11 +650,16 @@
</span><span class="cx"> selector = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- views = _.isArray( views ) ? views : [ views ];
</del><ins>+ if ( existing = this.get( selector ) ) {
+ views = _.isArray( views ) ? views : [ views ];
+ this._views[ selector ] = views.length ? _.difference( existing, views ) : [];
+ }
</ins><span class="cx">
</span><del>- if ( existing = this.get( selector ) )
- this._views[ selector ] = _.difference( existing, views );
</del><ins>+ return this;
+ },
</ins><span class="cx">
</span><ins>+ detach: function() {
+ $( _.pluck( this.all(), 'el' ) ).detach();
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -660,8 +681,9 @@
</span><span class="cx"> delete this.parent;
</span><span class="cx"> delete this.selector;
</span><span class="cx">
</span><del>- _.chain( this._views ).flatten().invoke('dispose');
</del><ins>+ _.invoke( this.all(), 'dispose' );
</ins><span class="cx"> this._views = [];
</span><ins>+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> replace: function( $target, els ) {
</span><span class="lines">@@ -669,7 +691,7 @@
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- attach: function( $target, els, options ) {
</del><ins>+ insert: function( $target, els, options ) {
</ins><span class="cx"> var at = options && options.at,
</span><span class="cx"> $children;
</span><span class="cx">
</span><span class="lines">@@ -717,6 +739,25 @@
</span><span class="cx"> remove: function() {
</span><span class="cx"> this.dispose();
</span><span class="cx"> return Backbone.View.prototype.remove.apply( this, arguments );
</span><ins>+ },
+
+ render: function() {
+ var options;
+
+ this.views.detach();
+
+ if ( this.template ) {
+ options = this.prepare ? this.prepare() : {};
+ this.trigger( 'prepare', options );
+ this.$el.html( this.template( options ) );
+ }
+
+ this.views.render();
+ return this;
+ },
+
+ prepare: function() {
+ return this.options;
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -755,15 +796,6 @@
</span><span class="cx"> }, this );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- render: function() {
- if ( ! this.template )
- return;
-
- this.$el.html( this.template( this.options ) );
- this.views.render();
- return this;
- },
-
</del><span class="cx"> reset: function() {
</span><span class="cx"> this.states.invoke( 'trigger', 'reset' );
</span><span class="cx"> return this;
</span></span></pre>
</div>
</div>
</body>
</html>