<!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>[28033] trunk/src/wp-admin: Theme Installer: Disable prev/next buttons on first/last themes, add Esc handling, use IDs.</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/28033">28033</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-08 03:57:01 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Installer: Disable prev/next buttons on first/last themes, add Esc handling, use IDs.
props adamsilverstein, DH-Shredder.
fixes <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>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</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 (28032 => 28033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/themes.css 2014-04-08 02:31:02 UTC (rev 28032)
+++ trunk/src/wp-admin/css/themes.css 2014-04-08 03:57:01 UTC (rev 28033)
</span><span class="lines">@@ -1770,7 +1770,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #customize-container iframe,
</span><del>-#theme-installer iframe {
</del><ins>+.theme-install-overlay iframe {
</ins><span class="cx"> height: 100%;
</span><span class="cx"> width: 100%;
</span><span class="cx"> z-index: 20;
</span><span class="lines">@@ -1786,11 +1786,11 @@
</span><span class="cx"> margin-top: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer {
</del><ins>+.theme-install-overlay {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer.single-theme {
</del><ins>+.theme-install-overlay.single-theme {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1803,7 +1803,7 @@
</span><span class="cx"> padding-top: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer .install-theme-info {
</del><ins>+.theme-install-overlay .install-theme-info {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1846,22 +1846,22 @@
</span><span class="cx"> max-width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer .wp-full-overlay-header {
</del><ins>+.theme-install-overlay .wp-full-overlay-header {
</ins><span class="cx"> margin-top: 9px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer .wp-full-overlay-header .theme-install {
</del><ins>+.theme-install-overlay .wp-full-overlay-header .theme-install {
</ins><span class="cx"> float: right;
</span><span class="cx"> /* For when .theme-install is a span rather than a.button-primary (already installed theme) */
</span><span class="cx"> line-height: 26px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer .wp-full-overlay-sidebar {
</del><ins>+.theme-install-overlay .wp-full-overlay-sidebar {
</ins><span class="cx"> background: #EEE;
</span><span class="cx"> border-right: 1px solid #DDD;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#theme-installer .wp-full-overlay-main {
</del><ins>+.theme-install-overlay .wp-full-overlay-main {
</ins><span class="cx"> background: #fff url(../images/spinner.gif) no-repeat center center;
</span><span class="cx"> -webkit-background-size: 20px 20px;
</span><span class="cx"> background-size: 20px 20px;
</span><span class="lines">@@ -1884,7 +1884,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .customize-loading #customize-container,
</span><del>- #theme-installer .wp-full-overlay-main {
</del><ins>+ .theme-install-overlay .wp-full-overlay-main {
</ins><span class="cx"> background-image: url(../images/spinner-2x.gif);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (28032 => 28033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2014-04-08 02:31:02 UTC (rev 28032)
+++ trunk/src/wp-admin/js/theme.js 2014-04-08 03:57:01 UTC (rev 28033)
</span><span class="lines">@@ -443,6 +443,22 @@
</span><span class="cx"> this.touchDrag = true;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ // 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"> preview: function( event ) {
</span><span class="cx"> var self = this,
</span><span class="cx"> current, preview;
</span><span class="lines">@@ -511,6 +527,7 @@
</span><span class="cx">
</span><span class="cx"> // Render and append.
</span><span class="cx"> preview.render();
</span><ins>+ this.setNavButtonsState();
</ins><span class="cx"> $( 'div.wrap' ).append( preview.el );
</span><span class="cx"> $( '.next-theme' ).focus();
</span><span class="cx"> })
</span><span class="lines">@@ -539,9 +556,11 @@
</span><span class="cx">
</span><span class="cx"> // Render and append.
</span><span class="cx"> preview.render();
</span><ins>+ this.setNavButtonsState();
</ins><span class="cx"> $( 'div.wrap' ).append( preview.el );
</span><span class="cx"> $( '.previous-theme' ).focus();
</span><span class="cx"> });
</span><ins>+ self.setNavButtonsState();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -676,7 +695,7 @@
</span><span class="cx"> this.trigger( 'theme:collapse' );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Confirmation dialoge for deleting a theme
</del><ins>+ // Confirmation dialog for deleting a theme
</ins><span class="cx"> deleteTheme: function() {
</span><span class="cx"> return confirm( themes.data.settings.confirmDelete );
</span><span class="cx"> },
</span><span class="lines">@@ -684,11 +703,13 @@
</span><span class="cx"> nextTheme: function() {
</span><span class="cx"> var self = this;
</span><span class="cx"> self.trigger( 'theme:next', self.model.cid );
</span><ins>+ return false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> previousTheme: function() {
</span><span class="cx"> var self = this;
</span><span class="cx"> self.trigger( 'theme:previous', self.model.cid );
</span><ins>+ return false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Checks if the theme screenshot is the old 300px width version
</span><span class="lines">@@ -712,7 +733,7 @@
</span><span class="cx"> themes.view.Preview = themes.view.Details.extend({
</span><span class="cx">
</span><span class="cx"> className: 'wp-full-overlay expanded',
</span><del>- el: '#theme-installer',
</del><ins>+ el: '.theme-install-overlay',
</ins><span class="cx">
</span><span class="cx"> events: {
</span><span class="cx"> 'click .close-full-overlay': 'close',
</span><span class="lines">@@ -725,20 +746,28 @@
</span><span class="cx"> html: themes.template( 'theme-preview' ),
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><del>- var data = this.model.toJSON();
</del><ins>+ var data = this.model.toJSON(),
+ self = this;
</ins><span class="cx"> this.$el.html( this.html( data ) );
</span><span class="cx">
</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' );
</del><ins>+ $( 'body' )
+ .addClass( 'theme-installer-active full-overlay-active' )
+ .on( 'keyup.overlay', function( event ) {
+ // Pressing the escape key closes the preview
+ if ( event.keyCode === 27 ) {
+ self.close();
+ }
+ });
</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' );
</del><ins>+ $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' ).off( 'keyup.overlay' );
</ins><span class="cx">
</span><span class="cx"> // Return focus to the theme div
</span><span class="cx"> if ( themes.focusedTheme ) {
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-install.php (28032 => 28033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-install.php 2014-04-08 02:31:02 UTC (rev 28032)
+++ trunk/src/wp-admin/theme-install.php 2014-04-08 03:57:01 UTC (rev 28033)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="theme-browser"></div>
</span><del>- <div id="theme-installer" class="wp-full-overlay expanded"></div>
</del><ins>+ <div class="theme-install-overlay wp-full-overlay expanded"></div>
</ins><span class="cx">
</span><span class="cx"> <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
</span><span class="cx"> <span class="spinner"></span>
</span></span></pre>
</div>
</div>
</body>
</html>