<!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>[22101] trunk/wp-includes/js/media-views.js: Allow galleries to be reordered by drag and drop.</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/22101">22101</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-03 04:21:50 +0000 (Wed, 03 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow galleries to be reordered by drag and drop.
An `Attachments` view now accepts a `sortable` property. Manual sorting is only enabled when the corresponding collection doesn't have a comparator.
jQuery UI sortable must be enqueued for sorting to work.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</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 (22100 => 22101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-03 00:27:16 UTC (rev 22100)
+++ trunk/wp-includes/js/media-views.js 2012-10-03 04:21:50 UTC (rev 22101)
</span><span class="lines">@@ -499,8 +499,8 @@
</span><span class="cx"> className: 'media-workspace',
</span><span class="cx"> template: media.template('media-workspace'),
</span><span class="cx">
</span><del>- // The single `Attachment` view to be used in the `Attachments` view.
- AttachmentView: media.view.Attachment,
</del><ins>+ // The `options` to be passed to `Attachments` view.
+ attachmentsView: {},
</ins><span class="cx">
</span><span class="cx"> events: {
</span><span class="cx"> 'dragenter': 'maybeInitUploader',
</span><span class="lines">@@ -511,20 +511,27 @@
</span><span class="cx"> this.controller = this.options.controller;
</span><span class="cx">
</span><span class="cx"> _.defaults( this.options, {
</span><del>- selectOne: false,
- uploader: {}
</del><ins>+ selectOne: false,
+ uploader: {},
+ attachmentsView: {}
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.$content = $('<div class="existing-attachments" />');
</span><span class="cx">
</span><del>- this.attachmentsView = new media.view.Attachments({
</del><ins>+ // Generate the `options` passed to the `Attachments` view.
+ // Order of priority from lowest to highest: the provided defaults,
+ // the prototypal `attachmentsView` property, the `attachmentsView`
+ // option for the current instance, and then the `controller` and
+ // `collection` keys, to ensure they're correctly set.
+ this.attachmentsView = _.extend( {
+ directions: this.controller.get('multiple') ? l10n.selectMediaMultiple : l10n.selectMediaSingular
+ }, this.attachmentsView, this.options.attachmentsView, {
</ins><span class="cx"> controller: this.controller,
</span><del>- directions: this.controller.get('multiple') ? l10n.selectMediaMultiple : l10n.selectMediaSingular,
- collection: this.collection,
-
- AttachmentView: this.AttachmentView
</del><ins>+ collection: this.collection
</ins><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Initialize the `Attachments` view.
+ this.attachmentsView = new media.view.Attachments( this.attachmentsView );
</ins><span class="cx"> this.$content.append( this.attachmentsView.$el );
</span><span class="cx">
</span><span class="cx"> // Track uploading attachments.
</span><span class="lines">@@ -581,9 +588,12 @@
</span><span class="cx"> * wp.media.view.Workspace.Library
</span><span class="cx"> */
</span><span class="cx"> media.view.Workspace.Library = media.view.Workspace.extend({
</span><del>- // The single `Attachment` view to be used in the `Attachments` view.
- AttachmentView: media.view.Attachment.Library,
</del><span class="cx">
</span><ins>+ attachmentsView: {
+ // The single `Attachment` view to be used in the `Attachments` view.
+ AttachmentView: media.view.Attachment.Library
+ },
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> media.view.Workspace.prototype.initialize.apply( this, arguments );
</span><span class="cx">
</span><span class="lines">@@ -654,9 +664,13 @@
</span><span class="cx"> * wp.media.view.Workspace.Gallery
</span><span class="cx"> */
</span><span class="cx"> media.view.Workspace.Gallery = media.view.Workspace.extend({
</span><del>- // The single `Attachment` view to be used in the `Attachments` view.
- AttachmentView: media.view.Attachment.Gallery,
</del><span class="cx">
</span><ins>+ attachmentsView: {
+ // The single `Attachment` view to be used in the `Attachments` view.
+ AttachmentView: media.view.Attachment.Gallery,
+ sortable: true
+ },
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> media.view.Workspace.prototype.initialize.apply( this, arguments );
</span><span class="cx"> this.initToolbarView();
</span><span class="lines">@@ -718,7 +732,8 @@
</span><span class="cx"> _.defaults( this.options, {
</span><span class="cx"> refreshSensitivity: 200,
</span><span class="cx"> refreshThreshold: 3,
</span><del>- AttachmentView: media.view.Attachment
</del><ins>+ AttachmentView: media.view.Attachment,
+ sortable: false
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> _.each(['add','remove'], function( method ) {
</span><span class="lines">@@ -734,8 +749,55 @@
</span><span class="cx">
</span><span class="cx"> this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
</span><span class="cx"> this.$list.on( 'scroll.attachments', this.scroll );
</span><ins>+
+ this.initSortable();
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ initSortable: function() {
+ var collection = this.collection,
+ from;
+
+ if ( ! this.options.sortable || ! $.fn.sortable )
+ return;
+
+ this.$list.sortable({
+ // If the `collection` has a `comparator`, disable sorting.
+ disabled: !! collection.comparator,
+
+ // Prevent attachments from being dragged outside the bounding
+ // box of the list.
+ containment: this.$list,
+
+ // Change the position of the attachment as soon as the
+ // mouse pointer overlaps a thumbnail.
+ tolerance: 'pointer',
+
+ // Record the initial `index` of the dragged model.
+ start: function( event, ui ) {
+ from = ui.item.index();
+ },
+
+ // Update the model's index in the collection.
+ // Do so silently, as the view is already accurate.
+ update: function( event, ui ) {
+ var model = collection.at( from );
+
+ collection.remove( model, {
+ silent: true
+ }).add( model, {
+ at: ui.item.index(),
+ silent: true
+ });
+ }
+ });
+
+ // If the `orderby` property is changed on the `collection`,
+ // check to see if we have a `comparator`. If so, disable sorting.
+ collection.props.on( 'change:orderby', function() {
+ this.$list.sortable( 'option', 'disabled', !! collection.comparator );
+ }, this );
+ },
+
</ins><span class="cx"> render: function() {
</span><span class="cx"> // Detach the list from the DOM to prevent event removal.
</span><span class="cx"> this.$list.detach();
</span></span></pre>
</div>
</div>
</body>
</html>