<!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>[28049] trunk/src/wp-admin: Theme installer keyboard fixes.</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/28049">28049</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-08 16:23:26 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme installer keyboard fixes. Updates <a href="http://core.trac.wordpress.org/changeset/28033">[28033]</a> and <a href="http://core.trac.wordpress.org/changeset/28036">[28036]</a>.
props matveb.
see <a href="http://core.trac.wordpress.org/ticket/27521">#27521</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/themes.css (28048 => 28049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/themes.css 2014-04-08 15:53:42 UTC (rev 28048)
+++ trunk/src/wp-admin/css/themes.css 2014-04-08 16:23:26 UTC (rev 28049)
</span><span class="lines">@@ -1077,23 +1077,15 @@
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="cx"> /* Already installed theme */
</span><del>-.theme-browser .theme.is-installed {
- cursor: default;
-}
</del><span class="cx"> .theme-browser .theme .theme-installed {
</span><span class="cx"> background: #0074a2;
</span><span class="cx"> }
</span><span class="cx"> .theme-browser .theme .theme-installed:before {
</span><span class="cx"> content: '\f147';
</span><span class="cx"> }
</span><del>-.theme-browser .theme.is-installed .theme-actions .button-primary,
-.theme-browser.rendered .theme.is-installed .more-details {
</del><ins>+.theme-browser .theme.is-installed .theme-actions .button-primary {
</ins><span class="cx"> display: none !important;
</span><span class="cx"> }
</span><del>-.theme-browser.rendered .theme.is-installed:hover .theme-screenshot img,
-.theme-browser.rendered .theme.is-installed:focus .theme-screenshot img {
- opacity: 1 !important;
-}
</del><span class="cx">
</span><span class="cx"> .theme-navigation {
</span><span class="cx"> background: #fff;
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (28048 => 28049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2014-04-08 15:53:42 UTC (rev 28048)
+++ trunk/src/wp-admin/js/theme.js 2014-04-08 16:23:26 UTC (rev 28049)
</span><span class="lines">@@ -442,22 +442,6 @@
</span><span class="cx"> this.touchDrag = true;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Handles .disabled classes for previous/next buttons in theme installer preview
- setNavButtonsState: function() {
- var $themeInstaller = $( '.theme-install-overlay' ),
- current = _.isUndefined( this.current ) ? this.model : this.current;
-
- // Disable previous at the zero position
- if ( 0 === this.model.collection.indexOf( current ) ) {
- $themeInstaller.find( '.previous-theme' ).addClass( 'disabled' );
- }
-
- // Disable next if the next model is undefined
- if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {
- $themeInstaller.find( '.next-theme' ).addClass( 'disabled' );
- }
- },
-
</del><span class="cx"> preview: function( event ) {
</span><span class="cx"> var self = this,
</span><span class="cx"> current, preview;
</span><span class="lines">@@ -496,6 +480,7 @@
</span><span class="cx">
</span><span class="cx"> // Render the view and append it.
</span><span class="cx"> preview.render();
</span><ins>+ this.setNavButtonsState();
</ins><span class="cx"> $( 'div.wrap' ).append( preview.el );
</span><span class="cx">
</span><span class="cx"> // Listen to our preview object
</span><span class="lines">@@ -535,6 +520,11 @@
</span><span class="cx"> // Keep track of current theme model.
</span><span class="cx"> current = self.model;
</span><span class="cx">
</span><ins>+ // Bail early if we are at the beginning of the collection
+ if ( self.model.collection.indexOf( self.current ) === 0 ) {
+ return;
+ }
+
</ins><span class="cx"> // If we have ventured away from current model update the current model position.
</span><span class="cx"> if ( ! _.isUndefined( self.current ) ) {
</span><span class="cx"> current = self.current;
</span><span class="lines">@@ -559,7 +549,26 @@
</span><span class="cx"> $( 'div.wrap' ).append( preview.el );
</span><span class="cx"> $( '.previous-theme' ).focus();
</span><span class="cx"> });
</span><del>- self.setNavButtonsState();
</del><ins>+
+ this.listenTo( preview, 'preview:close', function() {
+ self.current = self.model
+ });
+ },
+
+ // Handles .disabled classes for previous/next buttons in theme installer preview
+ setNavButtonsState: function() {
+ var $themeInstaller = $( '.theme-install-overlay' ),
+ current = _.isUndefined( this.current ) ? this.model : this.current;
+
+ // Disable previous at the zero position
+ if ( 0 === this.model.collection.indexOf( current ) ) {
+ $themeInstaller.find( '.previous-theme' ).addClass( 'disabled' );
+ }
+
+ // Disable next if the next model is undefined
+ if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {
+ $themeInstaller.find( '.next-theme' ).addClass( 'disabled' );
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -738,7 +747,8 @@
</span><span class="cx"> 'click .close-full-overlay': 'close',
</span><span class="cx"> 'click .collapse-sidebar': 'collapse',
</span><span class="cx"> 'click .previous-theme': 'previousTheme',
</span><del>- 'click .next-theme': 'nextTheme'
</del><ins>+ 'click .next-theme': 'nextTheme',
+ 'keyup': 'keyEvent'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // The HTML template for the theme preview
</span><span class="lines">@@ -752,30 +762,14 @@
</span><span class="cx"> themes.router.navigate( themes.router.baseUrl( '?theme=' + this.model.get( 'id' ) ), { replace: true } );
</span><span class="cx">
</span><span class="cx"> this.$el.fadeIn( 200, function() {
</span><del>- $( 'body' )
- .addClass( 'theme-installer-active full-overlay-active' )
- .on( 'keyup.overlay', function( event ) {
- // The escape key closes the preview
- if ( event.keyCode === 27 ) {
- self.close();
- }
- // The right arrow key, next theme
- if ( event.keyCode === 39 ) {
- self.nextTheme();
- }
-
- // The left arrow key, previous theme
- if ( event.keyCode === 37 ) {
- self.previousTheme();
- }
- });
</del><ins>+ $( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
</ins><span class="cx"> $( '.close-full-overlay' ).focus();
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> close: function() {
</span><span class="cx"> this.$el.fadeOut( 200, function() {
</span><del>- $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' ).off( 'keyup.overlay' );
</del><ins>+ $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' );
</ins><span class="cx">
</span><span class="cx"> // Return focus to the theme div
</span><span class="cx"> if ( themes.focusedTheme ) {
</span><span class="lines">@@ -784,6 +778,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> themes.router.navigate( themes.router.baseUrl( '' ) );
</span><ins>+ this.trigger( 'preview:close' );
</ins><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -791,6 +786,23 @@
</span><span class="cx">
</span><span class="cx"> this.$el.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
</span><span class="cx"> return false;
</span><ins>+ },
+
+ keyEvent: function( event ) {
+ // The escape key closes the preview
+ if ( event.keyCode === 27 ) {
+ this.undelegateEvents();
+ this.close();
+ }
+ // The right arrow key, next theme
+ if ( event.keyCode === 39 ) {
+ _.once( this.nextTheme() );
+ }
+
+ // The left arrow key, previous theme
+ if ( event.keyCode === 37 ) {
+ this.previousTheme();
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>