<!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>[22684] trunk/wp-includes/js/media-views.js: Media: Add silent options to the views; improve documentation.</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/22684">22684</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-19 12:11:16 +0000 (Mon, 19 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Add silent options to the views; improve documentation. 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 (22683 => 22684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-19 10:58:31 UTC (rev 22683)
+++ trunk/wp-includes/js/media-views.js 2012-11-19 12:11:16 UTC (rev 22684)
</span><span class="lines">@@ -613,16 +613,26 @@
</span><span class="cx"> // is used. `views` accepts a `Backbone.View` instance or an array of
</span><span class="cx"> // `Backbone.View` instances.
</span><span class="cx"> //
</span><del>- // Use `Views.add()` as a shortcut for setting `options.add` to `true`.
</del><ins>+ // ---
</ins><span class="cx"> //
</span><span class="cx"> // Accepts an `options` object, which has a significant effect on the
</span><del>- // resulting behavior. By default, the provided `views` will replace
</del><ins>+ // resulting behavior.
+ //
+ // `options.silent` &ndash; *boolean, `false`*
+ // > If `options.silent` is true, no DOM modifications will be made.
+ //
+ // `options.add` &ndash; *boolean, `false`*
+ // > Use `Views.add()` as a shortcut for setting `options.add` to true.
+ //
+ // > By default, the provided `views` will replace
</ins><span class="cx"> // any existing views associated with the selector. If `options.add`
</span><del>- // is set to `true`, the provided `views` will be added to the existing
- // views. When adding, the `views` will added to the end of the array
- // by default. To insert `views` at a specific index, use `options.at`.
</del><ins>+ // is true, the provided `views` will be added to the existing views.
+ //
+ // `options.at` &ndash; *integer, `undefined`*
+ // > When adding, to insert `views` at a specific index, use
+ // `options.at`. By default, `views` are added to the end of the array.
</ins><span class="cx"> set: function( selector, views, options ) {
</span><del>- var $selector, els, existing, add, method;
</del><ins>+ var $selector, els, existing, method;
</ins><span class="cx">
</span><span class="cx"> if ( ! _.isString( selector ) ) {
</span><span class="cx"> options = views;
</span><span class="lines">@@ -630,14 +640,14 @@
</span><span class="cx"> selector = '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ options = options || {};
</ins><span class="cx"> views = _.isArray( views ) ? views : [ views ];
</span><del>- add = options && options.add;
</del><span class="cx"> existing = this.get( selector );
</span><span class="cx"> next = views;
</span><del>- method = add ? 'insert' : 'replace';
</del><ins>+ method = options.add ? 'insert' : 'replace';
</ins><span class="cx">
</span><span class="cx"> if ( existing ) {
</span><del>- if ( add ) {
</del><ins>+ if ( options.add ) {
</ins><span class="cx"> if ( _.isUndefined( options.at ) )
</span><span class="cx"> next = existing.concat( views );
</span><span class="cx"> else
</span><span class="lines">@@ -672,7 +682,9 @@
</span><span class="cx"> subviews.selector = selector;
</span><span class="cx"> }, this );
</span><span class="cx">
</span><del>- this[ method ]( $selector, els, options );
</del><ins>+ if ( ! options.silent )
+ this[ method ]( $selector, els, options );
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -690,8 +702,10 @@
</span><span class="cx"> //
</span><span class="cx"> // Accepts an `options` object. By default, provided `views` will be
</span><span class="cx"> // inserted at the end of the array of existing views. To insert
</span><del>- // `views` at a specific index, use `options.at`. For more information
- // on the `options` object, see `Views.set()`.
</del><ins>+ // `views` at a specific index, use `options.at`. If `options.silent`
+ // is true, no DOM modifications will be made.
+ //
+ // For more information on the `options` object, see `Views.set()`.
</ins><span class="cx"> add: function( selector, views, options ) {
</span><span class="cx"> return this.set( selector, views, _.extend({ add: true }, options ) );
</span><span class="cx"> },
</span><span class="lines">@@ -699,11 +713,16 @@
</span><span class="cx"> // ### Stop tracking subviews
</span><span class="cx"> //
</span><span class="cx"> // Stops tracking `views` registered to a `selector`. If no `views` are
</span><del>- // set, then all of the `selector`'s subviews will be unregistered.
- unset: function( selector, views ) {
</del><ins>+ // set, then all of the `selector`'s subviews will be unregistered and
+ // disposed.
+ //
+ // Accepts an `options` object. If `options.silent` is set, `dispose`
+ // will *not* be triggered on the unregistered views.
+ unset: function( selector, views, options ) {
</ins><span class="cx"> var existing;
</span><span class="cx">
</span><span class="cx"> if ( ! _.isString( selector ) ) {
</span><ins>+ options = views;
</ins><span class="cx"> views = selector;
</span><span class="cx"> selector = '';
</span><span class="cx"> }
</span><span class="lines">@@ -713,6 +732,9 @@
</span><span class="cx"> this._views[ selector ] = views.length ? _.difference( existing, views ) : [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! options || ! options.silent )
+ _.invoke( views, 'dispose', { silent: true });
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -746,11 +768,18 @@
</span><span class="cx">
</span><span class="cx"> // ### Dispose all subviews
</span><span class="cx"> //
</span><del>- // Triggers the `dispose()` method on all subviews. Resets the
- // internals of the views manager.
- dispose: function() {
- delete this.parent;
- delete this.selector;
</del><ins>+ // Triggers the `dispose()` method on all subviews. Detaches the master
+ // view from its parent. Resets the internals of the views manager.
+ //
+ // Accepts an `options` object. If `options.silent` is set, `unset`
+ // will *not* be triggered on the master view's parent.
+ dispose: function( options ) {
+ if ( ! options || ! options.silent ) {
+ if ( this.parent && this.parent.views )
+ this.parent.views.unset( this.selector, this.view, { silent: true });
+ delete this.parent;
+ delete this.selector;
+ }
</ins><span class="cx">
</span><span class="cx"> _.invoke( this.all(), 'dispose' );
</span><span class="cx"> this._views = [];
</span></span></pre>
</div>
</div>
</body>
</html>