<!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>[26210] trunk/src/wp-admin/js/theme-install.js: Fix JSHint errors in theme-install.js.</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/26210">26210</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-15 14:15:39 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSHint errors in theme-install.js.
props kovshenin.
fixes <a href="http://core.trac.wordpress.org/ticket/26045">#26045</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsthemeinstalljs">trunk/src/wp-admin/js/theme-install.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsthemeinstalljs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme-install.js (26209 => 26210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme-install.js 2013-11-15 06:51:23 UTC (rev 26209)
+++ trunk/src/wp-admin/js/theme-install.js 2013-11-15 14:15:39 UTC (rev 26210)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+/* global ajaxurl, list_args, theme_list_args */
+
+var theme_viewer;
+
</ins><span class="cx"> /**
</span><span class="cx"> * Theme Browsing
</span><span class="cx"> *
</span><span class="lines">@@ -28,16 +32,18 @@
</span><span class="cx"> tb_position = function() {
</span><span class="cx"> var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 1040 < width ) ? 1040 : width, adminbar_height = 0;
</span><span class="cx">
</span><del>- if ( $('body.admin-bar').length )
</del><ins>+ if ( $('body.admin-bar').length ) {
</ins><span class="cx"> adminbar_height = 28;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( tbWindow.size() ) {
</span><span class="cx"> tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
</span><span class="cx"> $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
</span><span class="cx"> tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
</span><del>- if ( typeof document.body.style.maxWidth != 'undefined' )
</del><ins>+ if ( typeof document.body.style.maxWidth !== 'undefined' ) {
</ins><span class="cx"> tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
</span><del>- };
</del><ins>+ }
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $(window).resize(function(){ tb_position(); });
</span><span class="lines">@@ -49,8 +55,9 @@
</span><span class="cx"> * Displays theme previews on theme install pages.
</span><span class="cx"> */
</span><span class="cx"> jQuery( function($) {
</span><del>- if( ! window.postMessage )
</del><ins>+ if ( ! window.postMessage ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> var preview = $('#theme-installer'),
</span><span class="cx"> info = preview.find('.install-theme-info'),
</span><span class="lines">@@ -86,7 +93,7 @@
</span><span class="cx"> var ThemeViewer;
</span><span class="cx">
</span><span class="cx"> (function($){
</span><del>- ThemeViewer = function( args ) {
</del><ins>+ ThemeViewer = function() {
</ins><span class="cx">
</span><span class="cx"> function init() {
</span><span class="cx"> $( '#filter-click, #mini-filter-click' ).unbind( 'click' ).click( function() {
</span><span class="lines">@@ -100,13 +107,15 @@
</span><span class="cx"> var count = $( '#filter-box :checked' ).length,
</span><span class="cx"> text = $( '#filter-click' ).text();
</span><span class="cx">
</span><del>- if ( text.indexOf( '(' ) != -1 )
</del><ins>+ if ( text.indexOf( '(' ) !== -1 ) {
</ins><span class="cx"> text = text.substr( 0, text.indexOf( '(' ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( count == 0 )
</del><ins>+ if ( count === 0 ) {
</ins><span class="cx"> $( '#filter-click' ).text( text );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $( '#filter-click' ).text( text + ' (' + count + ')' );
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /* $('#filter-box :submit').unbind( 'click' ).click(function() {
</span><span class="lines">@@ -130,11 +139,11 @@
</span><span class="cx"> init: init
</span><span class="cx"> };
</span><span class="cx">
</span><del>- return api;
- }
</del><ins>+ return api;
+ };
</ins><span class="cx"> })(jQuery);
</span><span class="cx">
</span><del>-jQuery( document ).ready( function($) {
</del><ins>+jQuery( document ).ready( function() {
</ins><span class="cx"> theme_viewer = new ThemeViewer();
</span><span class="cx"> theme_viewer.init();
</span><span class="cx"> });
</span><span class="lines">@@ -169,9 +178,10 @@
</span><span class="cx">
</span><span class="cx"> // Get out early if we don't have the required arguments.
</span><span class="cx"> if ( typeof ajaxurl === 'undefined' ||
</span><del>- typeof list_args === 'undefined' ||
- typeof theme_list_args === 'undefined' ) {
- $('.pagination-links').show();
</del><ins>+ typeof list_args === 'undefined' ||
+ typeof theme_list_args === 'undefined' ) {
+
+ $('.pagination-links').show();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,11 +199,11 @@
</span><span class="cx"> * If there are more pages to query, then start polling to track
</span><span class="cx"> * when user hits the bottom of the current page
</span><span class="cx"> */
</span><del>- if ( theme_list_args.total_pages >= this.nextPage )
- this.pollInterval =
- setInterval( function() {
- return self.poll();
- }, this.scrollPollingDelay );
</del><ins>+ if ( theme_list_args.total_pages >= this.nextPage ) {
+ this.pollInterval = setInterval( function() {
+ return self.poll();
+ }, this.scrollPollingDelay );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -207,8 +217,9 @@
</span><span class="cx"> var bottom = this.$document.scrollTop() + this.$window.innerHeight();
</span><span class="cx">
</span><span class="cx"> if ( this.querying ||
</span><del>- ( bottom < this.$outList.height() - this.outListBottomThreshold ) )
</del><ins>+ ( bottom < this.$outList.height() - this.outListBottomThreshold ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.ajax();
</span><span class="cx"> },
</span><span class="lines">@@ -227,11 +238,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( this.nextPage > theme_list_args.total_pages )
</del><ins>+ if ( this.nextPage > theme_list_args.total_pages ) {
</ins><span class="cx"> clearInterval( this.pollInterval );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( this.nextPage <= ( theme_list_args.total_pages + 1 ) )
</del><ins>+ if ( this.nextPage <= ( theme_list_args.total_pages + 1 ) ) {
</ins><span class="cx"> this.$outList.append( results.rows );
</span><ins>+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -241,11 +254,8 @@
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><span class="cx"> ajax: function() {
</span><del>- var self = this;
-
- this.querying = true;
-
- var query = {
</del><ins>+ var self = this,
+ query = {
</ins><span class="cx"> action: 'fetch-list',
</span><span class="cx"> paged: this.nextPage,
</span><span class="cx"> s: theme_list_args.search,
</span><span class="lines">@@ -256,6 +266,8 @@
</span><span class="cx"> 'list_args': list_args
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ this.querying = true;
+
</ins><span class="cx"> this.$spinner.show();
</span><span class="cx"> $.getJSON( ajaxurl, query )
</span><span class="cx"> .done( function( response ) {
</span><span class="lines">@@ -270,9 +282,9 @@
</span><span class="cx"> setTimeout( function() { self.ajax(); }, self.failedRetryDelay );
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><del>- $(document).ready( function($) {
</del><ins>+ $(document).ready( function() {
</ins><span class="cx"> ThemeScroller.init();
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>