<!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>[22348] trunk/wp-includes: Media: Update gallery editing to work with the new frame view.</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/22348">22348</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-31 21:43:59 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Update gallery editing to work with the new frame view. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
<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="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22347 => 22348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-10-31 21:39:23 UTC (rev 22347)
+++ trunk/wp-includes/js/mce-view.js 2012-10-31 21:43:59 UTC (rev 22348)
</span><span class="lines">@@ -690,26 +690,29 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> edit: function() {
</span><del>- if ( ! wp.media.view || this.workflow )
</del><ins>+ if ( ! wp.media.view || this.frame )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- this.workflow = wp.media({
</del><ins>+ this.frame = wp.media({
</ins><span class="cx"> state: 'gallery',
</span><del>- selection: this.attachments.models,
</del><span class="cx"> title: mceview.l10n.editGallery,
</span><span class="cx"> editing: true,
</span><del>- multiple: true
</del><ins>+ multiple: true,
+ selection: new wp.media.model.Selection( this.attachments.models, {
+ props: this.attachments.props.toJSON(),
+ multiple: true
+ })
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- // Create a single-use workflow. If the workflow is closed,
</del><ins>+ // Create a single-use frame. If the frame is closed,
</ins><span class="cx"> // then detach it from the DOM and remove the reference.
</span><del>- this.workflow.on( 'close', function() {
- this.workflow.detach();
- delete this.workflow;
</del><ins>+ this.frame.on( 'close', function() {
+ this.frame.detach();
+ delete this.frame;
</ins><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> // Update the `shortcode` and `attachments`.
</span><del>- this.workflow.on( 'update:gallery', function( selection ) {
</del><ins>+ this.frame.get('gallery').on( 'update', function( selection ) {
</ins><span class="cx"> var view = mceview.get('gallery');
</span><span class="cx">
</span><span class="cx"> this.options.shortcode = view.gallery.shortcode( selection );
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22347 => 22348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-31 21:39:23 UTC (rev 22347)
+++ trunk/wp-includes/js/media-views.js 2012-10-31 21:43:59 UTC (rev 22348)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> id: 'library',
</span><span class="cx"> multiple: false,
</span><span class="cx"> describe: false,
</span><del>- title: l10n.mediaLibrary
</del><ins>+ title: l10n.mediaLibraryTitle
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="lines">@@ -262,8 +262,9 @@
</span><span class="cx"> id: 'gallery',
</span><span class="cx"> multiple: false,
</span><span class="cx"> describe: true,
</span><del>- title: l10n.createGallery,
- edge: 199
</del><ins>+ title: l10n.createGalleryTitle,
+ edge: 199,
+ editing: false
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toolbar: function() {
</span><span class="lines">@@ -324,7 +325,8 @@
</span><span class="cx"> library: {},
</span><span class="cx"> modal: true,
</span><span class="cx"> multiple: false,
</span><del>- uploader: true
</del><ins>+ uploader: true,
+ editing: false
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.createSelection();
</span><span class="lines">@@ -379,7 +381,8 @@
</span><span class="cx"> multiple: this.options.multiple
</span><span class="cx"> }),
</span><span class="cx"> new media.controller.Gallery({
</span><del>- library: options.selection
</del><ins>+ library: options.selection,
+ editing: options.editing
</ins><span class="cx"> })
</span><span class="cx"> ]);
</span><span class="cx">
</span><span class="lines">@@ -824,9 +827,9 @@
</span><span class="cx"> controller = this.options.controller;
</span><span class="cx">
</span><span class="cx"> this.options.items = {
</span><del>- 'update-gallery': {
</del><ins>+ update: {
</ins><span class="cx"> style: 'primary',
</span><del>- text: editing ? l10n.updateGallery : l10n.insertGalleryIntoPost,
</del><ins>+ text: editing ? l10n.updateGallery : l10n.insertGallery,
</ins><span class="cx"> priority: 40,
</span><span class="cx"> click: function() {
</span><span class="cx"> controller.close();
</span><span class="lines">@@ -836,12 +839,15 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- 'return-to-library': {
- text: editing ? l10n.addImagesFromLibrary : l10n.returnToLibrary,
- priority: -40,
</del><ins>+ cancel: {
+ text: l10n.cancel,
+ priority: -60,
</ins><span class="cx">
</span><span class="cx"> click: function() {
</span><del>- this.controller.state('library');
</del><ins>+ if ( editing )
+ controller.close();
+ else
+ controller.state('library');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22347 => 22348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-10-31 21:39:23 UTC (rev 22347)
+++ trunk/wp-includes/script-loader.php 2012-10-31 21:43:59 UTC (rev 22348)
</span><span class="lines">@@ -325,20 +325,19 @@
</span><span class="cx"> // Generic
</span><span class="cx"> 'insertMedia' => __( 'Insert Media' ),
</span><span class="cx"> 'search' => __( 'Search' ),
</span><ins>+ 'cancel' => __( 'Cancel' ),
+ 'addImages' => __( 'Add images' ),
</ins><span class="cx">
</span><span class="cx"> // Library
</span><del>- 'mediaLibrary' => __( 'Media Library' ),
</del><ins>+ 'mediaLibraryTitle' => __( 'Media Library' ),
</ins><span class="cx"> 'createNewGallery' => __( 'Create a new gallery' ),
</span><span class="cx"> 'insertIntoPost' => __( 'Insert into post' ),
</span><span class="cx"> 'addToGallery' => __( 'Add to gallery' ),
</span><span class="cx">
</span><span class="cx"> // Gallery
</span><del>- 'createGallery' => __( 'Create Gallery' ),
- 'returnToLibrary' => __( 'Return to media library' ),
- 'continueEditingGallery' => __( 'Continue editing gallery' ),
- 'insertGalleryIntoPost' => __( 'Insert gallery into post' ),
- 'updateGallery' => __( 'Update gallery' ),
- 'addImagesFromLibrary' => __( 'Add images from media library' ),
</del><ins>+ 'createGalleryTitle' => __( 'Create Gallery' ),
+ 'insertGallery' => __( 'Insert gallery' ),
+ 'updateGallery' => __( 'Update gallery' ),
</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>