<!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>[1282] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js: WP.org Themes: Give previews their own place in history.</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/1282">1282</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/1282","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-02-19 20:01:44 +0000 (Thu, 19 Feb 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: Give previews their own place in history.
Allows users to navigate from index to Detail to Preview and back, using UI or
the browser back button. Also makes sure that if they navigate between themes
while in Preview, Detail come along for the ride and greets them with the right
theme once they leave Preview.
Fixes <a href="http://meta.trac.wordpress.org/ticket/843">#843</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>
</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-02-18 23:11:33 UTC (rev 1281)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-02-19 20:01:44 UTC (rev 1282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,6 +279,7 @@
</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">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,6 +306,7 @@
</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">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,6 +443,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( wp.themes.view.Preview.prototype, {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ render: function() {
+ var data = this.model.toJSON();
+
+ this.$el.html( this.html( data ) );
+
+ wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.themePath + this.model.get( 'id' ) + '/preview' ) );
+
+ this.$el.fadeIn( 200, function() {
+ $( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
+ $( '.close-full-overlay' ).focus();
+ });
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> close: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.fadeOut( 200, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).removeClass( 'theme-installer-active full-overlay-active' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,6 +469,7 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.themePath + this.model.get( 'id' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -520,12 +536,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( wp.themes.InstallerRouter.prototype, {
</span><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'browse/:sort/': 'sort',
- 'tag/:tag/': 'tag',
- 'search/:query/': 'search',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'browse/:sort/' : 'sort',
+ 'tag/:tag/' : 'tag',
+ 'search/:query/' : 'search',
</ins><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',
- '': 'sort'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':slug/preview/' : 'preview',
+ ':slug/' : 'preview',
+ '' : 'sort'
</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"> baseUrl: function( url ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,6 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Open the modal when matching the route for a single themes.
</span><span class="cx" style="display: block; padding: 0 10px"> wp.themes.router.on( 'route:preview', function( slug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.close-full-overlay' ).trigger( 'click' );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.listenToOnce( self.view.collection, 'query:success', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.view.view.expand( slug );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre>
</div>
</div>
</body>
</html>