<!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>[22356] trunk/wp-includes: Media: Update the gallery "add images" state.</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/22356">22356</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-02 01:20:01 +0000 (Fri, 02 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Update the gallery "add images" state. 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>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</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 (22355 => 22356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-31 23:56:23 UTC (rev 22355)
+++ trunk/wp-includes/js/media-views.js 2012-11-02 01:20:01 UTC (rev 22356)
</span><span class="lines">@@ -303,6 +303,32 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ media.controller.GalleryAddImages = media.controller.Library.extend({
+ defaults: {
+ id: 'gallery:add',
+ multiple: true,
+ title: l10n.createGalleryTitle
+ },
+
+ initialize: function() {
+ if ( ! this.get('library') )
+ this.set( 'library', media.query({ type: 'image' }) );
+ return media.controller.Library.prototype.initialize.apply( this, arguments );
+ },
+
+ toolbar: function() {
+ var frame = this.frame;
+
+ frame.toolbar( new media.view.Toolbar.GalleryAddImages({
+ controller: frame,
+ state: this
+ }) );
+ },
+
+ // Leave the sidebar.
+ sidebar: function() {}
+ });
+
</ins><span class="cx"> /**
</span><span class="cx"> * ========================================================================
</span><span class="cx"> * VIEWS
</span><span class="lines">@@ -383,7 +409,8 @@
</span><span class="cx"> new media.controller.Gallery({
</span><span class="cx"> library: options.selection,
</span><span class="cx"> editing: options.editing
</span><del>- })
</del><ins>+ }),
+ new media.controller.GalleryAddImages()
</ins><span class="cx"> ]);
</span><span class="cx">
</span><span class="cx"> // Set the default state.
</span><span class="lines">@@ -834,11 +861,24 @@
</span><span class="cx"> click: function() {
</span><span class="cx"> controller.close();
</span><span class="cx"> state.trigger( 'update', library );
</span><del>- library.clear();
</del><ins>+ controller.get('library').get('selection').clear();
</ins><span class="cx"> controller.state('library');
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ addImages: {
+ text: l10n.addImages,
+ priority: -40,
+
+ click: function() {
+ controller.get('gallery:add').set( 'selection', new media.model.Selection( library.models, {
+ props: library.props.toJSON(),
+ multiple: true
+ }) );
+ controller.state('gallery:add');
+ }
+ },
+
</ins><span class="cx"> cancel: {
</span><span class="cx"> text: l10n.cancel,
</span><span class="cx"> priority: -60,
</span><span class="lines">@@ -856,6 +896,41 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // wp.media.view.Toolbar.GalleryAddImages
+ // -----------------------------
+ media.view.Toolbar.GalleryAddImages = media.view.Toolbar.extend({
+ initialize: function() {
+ var state = this.options.state,
+ editing = state.get('editing'),
+ library = state.get('library'),
+ controller = this.options.controller;
+
+ this.options.items = {
+ update: {
+ style: 'primary',
+ text: l10n.continueEditing,
+ priority: 40,
+
+ click: function() {
+ controller.get('gallery').set( 'library', state.get('selection') );
+ controller.state('gallery');
+ }
+ },
+
+ cancel: {
+ text: l10n.cancel,
+ priority: -60,
+
+ click: function() {
+ controller.state('gallery');
+ }
+ }
+ };
+
+ media.view.Toolbar.prototype.initialize.apply( this, arguments );
+ }
+ });
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Button
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22355 => 22356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-10-31 23:56:23 UTC (rev 22355)
+++ trunk/wp-includes/script-loader.php 2012-11-02 01:20:01 UTC (rev 22356)
</span><span class="lines">@@ -338,6 +338,7 @@
</span><span class="cx"> 'createGalleryTitle' => __( 'Create Gallery' ),
</span><span class="cx"> 'insertGallery' => __( 'Insert gallery' ),
</span><span class="cx"> 'updateGallery' => __( 'Update gallery' ),
</span><ins>+ 'continueEditing' => __( 'Continue editing' ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>