<!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>[29555] trunk/src/wp-includes/js/media-views.js: Initial cleanup after [29220]:</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/29555">29555</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-20 19:13:50 +0000 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initial cleanup after <a href="http://core.trac.wordpress.org/changeset/29220">[29220]</a>:
* Alter/remove some jQuery global selectors, views should only manage themselves
* Trigger an event for attachments when arrow keys are pressed: `attachment:keydown:arrow`
* `media.view.Attachments` should listen for `attachment:keydown:arrow`
* Favor scoped selectors over globals
See <a href="http://core.trac.wordpress.org/ticket/23560">#23560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29554 => 29555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-20 17:29:36 UTC (rev 29554)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-20 19:13:50 UTC (rev 29555)
</span><span class="lines">@@ -4854,49 +4854,8 @@
</span><span class="cx"> * @param {Object} event
</span><span class="cx"> */
</span><span class="cx"> arrowEvent: function( event ) {
</span><del>- var attachment = $('.attachments-browser .attachment'),
- attachmentsWidth = $('.attachments-browser .attachments').width(),
- thumbnailWidth = attachment.first().outerWidth(),
- thumbnailsPerRow = Math.round( attachmentsWidth / thumbnailWidth ),
- totalThumnails = attachment.length,
- totalRows = Math.ceil(totalThumnails/thumbnailsPerRow),
- thisIndex = attachment.filter( ':focus' ).index(),
- thisIndexAdjusted = thisIndex + 1,
- thisRow = thisIndexAdjusted <= thumbnailsPerRow ? 1 : Math.ceil(thisIndexAdjusted/thumbnailsPerRow);
-
- // Left arrow
- if ( 37 === event.keyCode ) {
- if ( 0 === thisIndex ) {
- return;
- }
- attachment.eq( thisIndex - 1 ).focus();
- }
-
- // Up arrow
- if ( 38 === event.keyCode ) {
- if ( 1 === thisRow ) {
- return;
- }
- attachment.eq( thisIndex - thumbnailsPerRow ).focus();
- }
-
- // Right arrow
- if ( 39 === event.keyCode ) {
- if ( totalThumnails === thisIndex ) {
- return;
- }
- attachment.eq( thisIndex + 1 ).focus();
- }
-
- // Down arrow
- if ( 40 === event.keyCode ) {
- if ( totalRows === thisRow ) {
- return;
- }
- attachment.eq( thisIndex + thumbnailsPerRow ).focus();
- }
-
- return false;
</del><ins>+ this.controller.trigger( 'attachment:keydown:arrow', event );
+ return false;
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @param {Object} options
</span><span class="lines">@@ -5315,6 +5274,8 @@
</span><span class="cx">
</span><span class="cx"> this.collection.on( 'reset', this.render, this );
</span><span class="cx">
</span><ins>+ this.listenTo( this.controller, 'attachment:keydown:arrow', this.arrowEvent );
+
</ins><span class="cx"> // Throttle the scroll handler and bind this.
</span><span class="cx"> this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
</span><span class="cx">
</span><span class="lines">@@ -5335,6 +5296,45 @@
</span><span class="cx"> _.defer( this.setColumns, this );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ arrowEvent: function( event ) {
+ var attachments = this.$el.children( 'li' ),
+ perRow = Math.round( this.$el.width() / attachments.first().outerWidth() ),
+ index = attachments.filter( ':focus' ).index(),
+ row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
+
+ // Left arrow
+ if ( 37 === event.keyCode ) {
+ if ( 0 === index ) {
+ return;
+ }
+ attachments.eq( index - 1 ).focus();
+ }
+
+ // Up arrow
+ if ( 38 === event.keyCode ) {
+ if ( 1 === row ) {
+ return;
+ }
+ attachments.eq( index - perRow ).focus();
+ }
+
+ // Right arrow
+ if ( 39 === event.keyCode ) {
+ if ( attachments.length === index ) {
+ return;
+ }
+ attachments.eq( index + 1 ).focus();
+ }
+
+ // Down arrow
+ if ( 40 === event.keyCode ) {
+ if ( Math.ceil( attachments.length / perRow ) === row ) {
+ return;
+ }
+ attachments.eq( index + perRow ).focus();
+ }
+ },
+
</ins><span class="cx"> dispose: function() {
</span><span class="cx"> this.collection.props.off( null, null, this );
</span><span class="cx"> $( window ).off( 'resize.media-modal-columns' );
</span><span class="lines">@@ -6581,12 +6581,11 @@
</span><span class="cx"> * @param {Object} event
</span><span class="cx"> */
</span><span class="cx"> toggleSelectionHandler: function( event ) {
</span><del>- if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === $( ':tabbable', this.$el ).filter( ':first' )[0] ) {
- $('.attachments-browser .details').focus();
</del><ins>+ if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
+ this.$( ':tabbable' ).eq( 0 ).blur();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>