<!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>[22792] trunk/wp-includes/js/media-views.js: Media: Rename PriorityList's add/remove methods to set/unset (to prevent the default remove from being overridden).</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/22792">22792</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 20:43:42 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Rename PriorityList's add/remove methods to set/unset (to prevent the default remove from being overridden). 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 (22791 => 22792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 20:34:46 UTC (rev 22791)
+++ trunk/wp-includes/js/media-views.js 2012-11-21 20:43:42 UTC (rev 22792)
</span><span class="lines">@@ -1116,7 +1116,7 @@
</span><span class="cx"> };
</span><span class="cx"> }, this );
</span><span class="cx">
</span><del>- this.menu.view().add( views );
</del><ins>+ this.menu.view().set( views );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hijackThickbox: function() {
</span><span class="lines">@@ -1439,7 +1439,7 @@
</span><span class="cx"> mainMenu: function() {
</span><span class="cx"> media.view.MediaFrame.Select.prototype.mainMenu.call( this, { silent: true });
</span><span class="cx">
</span><del>- this.menu.view().add({
</del><ins>+ this.menu.view().set({
</ins><span class="cx"> separateLibrary: new media.View({
</span><span class="cx"> className: 'separator',
</span><span class="cx"> priority: 60
</span><span class="lines">@@ -1538,7 +1538,7 @@
</span><span class="cx">
</span><span class="cx"> library.gallery = library.gallery || new Backbone.Model();
</span><span class="cx">
</span><del>- this.sidebar.view().add({
</del><ins>+ this.sidebar.view().set({
</ins><span class="cx"> gallery: new media.view.Settings.Gallery({
</span><span class="cx"> controller: this,
</span><span class="cx"> model: library.gallery,
</span><span class="lines">@@ -1560,7 +1560,7 @@
</span><span class="cx"> link: getUserSetting( 'urlbutton', 'post' )
</span><span class="cx"> });
</span><span class="cx">
</span><del>- this.sidebar.view().add({
</del><ins>+ this.sidebar.view().set({
</ins><span class="cx"> display: new media.view.Settings.AttachmentDisplay({
</span><span class="cx"> controller: this,
</span><span class="cx"> model: display[ single.cid ],
</span><span class="lines">@@ -2181,7 +2181,7 @@
</span><span class="cx"> this.controller = this.options.controller;
</span><span class="cx"> this._views = {};
</span><span class="cx">
</span><del>- this.add( _.extend( {}, this._views, this.options.views ), { silent: true });
</del><ins>+ this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
</ins><span class="cx"> delete this.options.views;
</span><span class="cx">
</span><span class="cx"> if ( ! this.options.silent )
</span><span class="lines">@@ -2209,13 +2209,13 @@
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- add: function( id, view, options ) {
</del><ins>+ set: function( id, view, options ) {
</ins><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.add( id, view, { silent: true });
</del><ins>+ this.set( id, view, { silent: true });
</ins><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> if ( ! options.silent )
</span><span class="lines">@@ -2238,7 +2238,7 @@
</span><span class="cx"> return this._views[ id ];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- remove: function( id, options ) {
</del><ins>+ unset: function( id, options ) {
</ins><span class="cx"> delete this._views[ id ];
</span><span class="cx"> if ( ! options || ! options.silent )
</span><span class="cx"> this.render();
</span></span></pre>
</div>
</div>
</body>
</html>