<!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>[1435] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js: WP.org Themes: Simplify app and remove some dead code.</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/1435">1435</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/1435","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-20 04:08:38 +0000 (Fri, 20 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: Simplify app and remove some dead code.
See <a href="http://meta.trac.wordpress.org/changeset/1434">r1434</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-03-20 00:10:03 UTC (rev 1434)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js 2015-03-20 04:08:38 UTC (rev 1435)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,8 +572,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Theme Details view
-// Set ups a modal overlay with the expanded theme data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Theme Details view
+ // Set ups a modal overlay with the expanded theme data
</ins><span class="cx" style="display: block; padding: 0 10px"> themes.view.Details = wp.Backbone.View.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> // Wrap theme data on a div.theme element
</span><span class="cx" style="display: block; padding: 0 10px"> className: 'theme-overlay',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,11 +1297,8 @@
</span><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"> events: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'input': 'search',
</del><span class="cx" style="display: block; padding: 0 10px"> 'keyup': 'search',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'change': 'search',
- 'search': 'search',
- 'blur': 'pushState'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'search': 'search'
</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"> initialize: function( options ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1314,93 +1311,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Runs a search on the theme collection.
- search: function( event ) {
- var options = {};
-
- // Clear on escape.
- if ( event.type === 'keyup' && event.which === 27 ) {
- event.target.value = '';
- }
-
- // Lose input focus when pressing enter
- if ( event.which === 13 ) {
- this.$el.trigger( 'blur' );
- }
-
- this.collection.doSearch( event.target.value );
-
- // if search is initiated and key is not return
- if ( this.searching && event.which !== 13 ) {
- options.replace = true;
- } else {
- this.searching = true;
- }
-
- // Update the URL hash
- if ( event.target.value ) {
- themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );
- } else {
- themes.router.navigate( themes.router.baseUrl( '' ) );
- }
- },
-
- pushState: function( event ) {
- var url = themes.router.baseUrl( '' );
-
- if ( event.target.value ) {
- url = themes.router.baseUrl( themes.router.searchPath + event.target.value );
- }
-
- this.searching = false;
- themes.router.navigate( url );
-
- }
- });
-
- // Sets up the routes events for relevant url queries
- // Listens to [theme] and [search] params
- themes.Router = Backbone.Router.extend({
-
- routes: {
- 'themes.php?theme=:slug': 'theme',
- 'themes.php?search=:query': 'search',
- 'themes.php?s=:query': 'search',
- 'themes.php': 'themes',
- '': 'themes'
- },
-
- baseUrl: function( url ) {
- return 'themes.php' + url;
- },
-
- themePath: '?theme=',
- searchPath: '?search=',
-
- search: function( query ) {
- $( '.wp-filter-search' ).val( query );
- },
-
- themes: function() {
- $( '.wp-filter-search' ).val( '' );
- },
-
- navigate: function() {
- if ( Backbone.history._hasPushState ) {
- Backbone.Router.prototype.navigate.apply( this, arguments );
- }
- }
-
- });
-
- // Extend the main Search view
- themes.view.InstallerSearch = themes.view.Search.extend({
-
- events: {
- 'keyup': 'search',
- 'search': 'search'
- },
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Handles Ajax request for searching through themes in public repo
</span><span class="cx" style="display: block; padding: 0 10px"> search: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1719,7 +1629,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.InstallerRouter = Backbone.Router.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.Router = Backbone.Router.extend({
</ins><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'browse/:sort/' : 'sort',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tags/:tag/' : 'tag',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,13 +1662,13 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.RunInstaller = {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.Run = {
</ins><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the view
</span><span class="cx" style="display: block; padding: 0 10px"> // Passes the default 'section' as an option
</span><span class="cx" style="display: block; padding: 0 10px"> this.view = new themes.view.Installer({
</span><span class="cx" style="display: block; padding: 0 10px"> section: 'featured',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- SearchView: themes.view.InstallerSearch
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SearchView: themes.view.Search
</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"> // Render results
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1784,7 +1694,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bind to our global `themes` object
</span><span class="cx" style="display: block; padding: 0 10px"> // so that the router is available to sub-views
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.router = new themes.InstallerRouter();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.router = new themes.Router();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Handles `theme` route event
</span><span class="cx" style="display: block; padding: 0 10px"> // Queries the API for the passed theme slug
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1840,7 +1750,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ready...
</span><span class="cx" style="display: block; padding: 0 10px"> $( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- themes.RunInstaller.init();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes.Run.init();
</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"> })( jQuery );
</span></span></pre>
</div>
</div>
</body>
</html>