<!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>[1453] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes: WP.org Themes: Don't create a `/preview/` URL for previews.</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="http://meta.trac.wordpress.org/changeset/1453">1453</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1453","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-26 00:43:29 +0000 (Thu, 26 Mar 2015)</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'>WP.org Themes: Don't create a `/preview/` URL for previews.
The default has always been wp-themes.com. Let's keep it that way and handle
the integrated preview in JS only.
Also provides a better fix for <a href="http://meta.trac.wordpress.org/ticket/901">#901</a>. If themes are advanced in preview, the
modal keeps up with that now.
Fixes <a href="http://meta.trac.wordpress.org/ticket/895">#895</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesjsthemejs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesviewtemplatesthemepreviewphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/view-templates/theme-preview.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-03-25 23:34:24 UTC (rev 1452)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-03-26 00:43:29 UTC (rev 1453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,13 +511,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preview.render();
</span><span class="cx" style="display: block; padding: 0 10px"> this.setNavButtonsState();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hide previous/next navigation if there is only one theme
- if ( this.model.collection.length === 1 ) {
- preview.$el.addClass( 'no-navigation' );
- } else {
- preview.$el.removeClass( 'no-navigation' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( themes.data.settings.isMobile ) {
</span><span class="cx" style="display: block; padding: 0 10px"> preview.$el.addClass( 'wp-full-overlay collapsed' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,6 +523,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Listen to our preview object
</span><span class="cx" style="display: block; padding: 0 10px"> // for `theme:next` and `theme:previous` events.
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( preview, 'theme:next', function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.trigger( 'theme:next' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Keep local track of current theme model.
</span><span class="cx" style="display: block; padding: 0 10px"> current = self.model;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,6 +550,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.next-theme' ).focus();
</span><span class="cx" style="display: block; padding: 0 10px"> })
</span><span class="cx" style="display: block; padding: 0 10px"> .listenTo( preview, 'theme:previous', function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.trigger( 'theme:previous' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Keep track of current theme model.
</span><span class="cx" style="display: block; padding: 0 10px"> current = self.model;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,7 +809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.html( this.html( data ) );
</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( themes.router.themePath + this.model.get( 'id' ) + '/preview' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.fadeIn( 200, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1072,14 +1069,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanity check which also serves as a boundary test
</span><span class="cx" style="display: block; padding: 0 10px"> if ( nextModel !== undefined ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // We have a new theme...
- // Close the overlay
- this.overlay.closeOverlay();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Trigger a route update for the current model
</span><span class="cx" style="display: block; padding: 0 10px"> self.theme.trigger( 'theme:expand', nextModel.cid );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,14 +1087,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> previousModel = self.collection.at( self.collection.indexOf( model ) - 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( previousModel !== undefined ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // We have a new theme...
- // Close the overlay
- this.overlay.closeOverlay();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Trigger a route update for the current model
</span><span class="cx" style="display: block; padding: 0 10px"> self.theme.trigger( 'theme:expand', previousModel.cid );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</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"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,7 +1445,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tags/:tag/' : 'tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'search/:query/' : 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author/:author/': 'author',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':slug/preview/' : 'preview',
</del><span class="cx" style="display: block; padding: 0 10px"> ':slug/' : 'preview',
</span><span class="cx" style="display: block; padding: 0 10px"> '' : 'sort'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesviewtemplatesthemepreviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/view-templates/theme-preview.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/view-templates/theme-preview.php 2015-03-25 23:34:24 UTC (rev 1452)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/view-templates/theme-preview.php 2015-03-26 00:43:29 UTC (rev 1453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="theme-name">{{ data.name }}</h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="theme-by"><?php printf( __( 'By %s' ), '{{ data.author.display_name }}' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img class="theme-screenshot" src="{{ data.screenshot_url }}?w=520&strip=all" alt="" />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-details">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="rating rating-{{ Math.round( data.rating / 10 ) * 10 }}">
</span></span></pre>
</div>
</div>
</body>
</html>