<!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>[40824] trunk/src/wp-admin/js/theme.js: Themes: improve browser history support on new themes page.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40824">40824</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40824","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-23 20:32:00 +0000 (Tue, 23 May 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Themes: improve browser history support on new themes page.
When closing the theme preview, restore the previously selected tab. Avoid an issue where duplicate entries in the history prevented navigation. When re-opening the preview, remove bound event handlers before re-adding them.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/36613">#36613</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2017-05-23 17:57:42 UTC (rev 40823)
+++ trunk/src/wp-admin/js/theme.js 2017-05-23 20:32:00 UTC (rev 40824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> themes.focusedTheme = this.$el;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Construct a new Preview view.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.currentPreview = preview = new themes.view.Preview({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.preview = preview = new themes.view.Preview({
</ins><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,10 +573,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self.current = self.model;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Listen for closepreview events, closing the preview.
- this.listenTo( preview, 'closepreview', function() {
- preview.close();
- });
</del><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Handles .disabled classes for previous/next buttons in theme installer preview
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -916,7 +912,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }).removeClass( 'iframe-ready' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.router.navigate( themes.router.baseUrl( '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Restore the previous browse tab if available.
+ if ( themes.router.selectedTab ) {
+ themes.router.navigate( themes.router.baseUrl( '?browse=' + themes.router.selectedTab ) );
+ themes.router.selectedTab = false;
+ } else {
+ themes.router.navigate( themes.router.baseUrl( '' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'preview:close' );
</span><span class="cx" style="display: block; padding: 0 10px"> this.undelegateEvents();
</span><span class="cx" style="display: block; padding: 0 10px"> this.unbind();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1651,6 +1653,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sort: function( sort ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.clearSearch();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Track sorting so we can restore the correct tab when closing preview.
+ themes.router.selectedTab = sort;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1914,6 +1919,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Queries the API for the passed theme slug
</span><span class="cx" style="display: block; padding: 0 10px"> themes.router.on( 'route:preview', function( slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove existing handlers.
+ if ( themes.preview ) {
+ themes.preview.undelegateEvents();
+ themes.preview.unbind();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the theme preview is active, set the current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.view.view.theme && self.view.view.theme.preview ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self.view.view.theme.model = self.view.collection.findWhere( { 'slug': slug } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1939,12 +1950,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> themes.router.on( 'route:sort', function( sort ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! sort ) {
</span><span class="cx" style="display: block; padding: 0 10px"> sort = 'featured';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.router.navigate( themes.router.baseUrl( '?browse=featured' ), { replace: true } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> self.view.sort( sort );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Close the preview if open.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( themes.currentPreview ) {
- themes.currentPreview.trigger( 'closepreview' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( themes.preview ) {
+ themes.preview.close();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>