<!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>[26232] trunk/src/wp-admin/js: Fix JSHint errors in three files.</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/26232">26232</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-15 23:18:18 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSHint errors in three files.
props tommcfarlin.
fixes <a href="http://core.trac.wordpress.org/ticket/25942">#25942</a>, <a href="http://core.trac.wordpress.org/ticket/25943">#25943</a>, <a href="http://core.trac.wordpress.org/ticket/25944">#25944</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsdashboardjs">trunk/src/wp-admin/js/dashboard.js</a></li>
<li><a href="#trunksrcwpadminjsmediagalleryjs">trunk/src/wp-admin/js/media-gallery.js</a></li>
<li><a href="#trunksrcwpadminjsthemepreviewjs">trunk/src/wp-admin/js/theme-preview.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/dashboard.js (26231 => 26232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/dashboard.js 2013-11-15 22:28:57 UTC (rev 26231)
+++ trunk/src/wp-admin/js/dashboard.js 2013-11-15 23:18:18 UTC (rev 26232)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>-/* global pagenow */
</del><ins>+/* global pagenow, ajaxurl, postboxes, wpActiveEditor:true */
</ins><span class="cx"> var ajaxWidgets, ajaxPopulateWidgets, quickPressLoad;
</span><span class="cx">
</span><span class="cx"> jQuery(document).ready( function($) {
</span><span class="cx"> /* Dashboard Welcome Panel */
</span><span class="cx"> var welcomePanel = $('#welcome-panel'),
</span><span class="cx"> welcomePanelHide = $('#wp_welcome_panel-hide'),
</span><del>- updateWelcomePanel = function( visible ) {
</del><ins>+ updateWelcomePanel = function( visible ) {
</ins><span class="cx"> $.post( ajaxurl, {
</span><span class="cx"> action: 'update-welcome-panel',
</span><span class="cx"> visible: visible,
</span><span class="lines">@@ -13,8 +13,9 @@
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if ( welcomePanel.hasClass('hidden') && welcomePanelHide.prop('checked') )
</del><ins>+ if ( welcomePanel.hasClass('hidden') && welcomePanelHide.prop('checked') ) {
</ins><span class="cx"> welcomePanel.removeClass('hidden');
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $('.welcome-panel-close, .welcome-panel-dismiss a', welcomePanel).click( function(e) {
</span><span class="cx"> e.preventDefault();
</span><span class="lines">@@ -48,8 +49,9 @@
</span><span class="cx">
</span><span class="cx"> if ( el ) {
</span><span class="cx"> el = el.toString();
</span><del>- if ( $.inArray(el, ajaxWidgets) != -1 )
</del><ins>+ if ( $.inArray(el, ajaxWidgets) !== -1 ) {
</ins><span class="cx"> show(0, el);
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $.each( ajaxWidgets, show );
</span><span class="cx"> }
</span><span class="lines">@@ -90,8 +92,9 @@
</span><span class="cx"> $('#title, #tags-input, #content').each( function() {
</span><span class="cx"> var input = $(this), prompt = $('#' + this.id + '-prompt-text');
</span><span class="cx">
</span><del>- if ( '' === this.value )
</del><ins>+ if ( '' === this.value ) {
</ins><span class="cx"> prompt.removeClass('screen-reader-text');
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> prompt.click( function() {
</span><span class="cx"> $(this).addClass('screen-reader-text');
</span><span class="lines">@@ -99,8 +102,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> input.blur( function() {
</span><del>- if ( '' === this.value )
</del><ins>+ if ( '' === this.value ) {
</ins><span class="cx"> prompt.removeClass('screen-reader-text');
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> input.focus( function() {
</span><span class="lines">@@ -109,8 +113,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $('#quick-press').on( 'click focusin', function() {
</span><del>- $(this).addClass("quickpress-open");
- $("#description-wrap, p.submit").slideDown(200);
</del><ins>+ $(this).addClass('quickpress-open');
+ $('#description-wrap, p.submit').slideDown(200);
</ins><span class="cx"> wpActiveEditor = 'content';
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="lines">@@ -120,10 +124,10 @@
</span><span class="cx"> $( '.show-more a' ).on( 'click', function(e) {
</span><span class="cx"> $( this ).fadeOut().closest('.activity-block').find( 'li.hidden' ).fadeIn().removeClass( 'hidden' );
</span><span class="cx"> e.preventDefault();
</span><del>- })
</del><ins>+ });
</ins><span class="cx">
</span><span class="cx"> // Dashboard columns
</span><del>- jQuery(document).ready(function ($) {
</del><ins>+ jQuery(document).ready(function () {
</ins><span class="cx"> // Update main column count on load
</span><span class="cx"> updateColumnCount();
</span><span class="cx"> });
</span><span class="lines">@@ -134,13 +138,19 @@
</span><span class="cx">
</span><span class="cx"> function updateColumnCount() {
</span><span class="cx"> var cols = 1,
</span><del>- windowWidth = parseInt(jQuery(window).width());
- if (799 < windowWidth && 1299 > windowWidth)
</del><ins>+ windowWidth = parseInt(jQuery(window).width(), 10);
+
+ if (799 < windowWidth && 1299 > windowWidth) {
</ins><span class="cx"> cols = 2;
</span><del>- if (1300 < windowWidth && 1799 > windowWidth)
</del><ins>+ }
+
+ if (1300 < windowWidth && 1799 > windowWidth) {
</ins><span class="cx"> cols = 3;
</span><del>- if (1800 < windowWidth)
</del><ins>+ }
+
+ if (1800 < windowWidth) {
</ins><span class="cx"> cols = 4;
</span><ins>+ }
</ins><span class="cx"> jQuery('.metabox-holder').attr('class', jQuery('.metabox-holder').attr('class').replace(/columns-\d+/, 'columns-' + cols));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminjsmediagalleryjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/media-gallery.js (26231 => 26232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/media-gallery.js 2013-11-15 22:28:57 UTC (rev 26231)
+++ trunk/src/wp-admin/js/media-gallery.js 2013-11-15 23:18:18 UTC (rev 26232)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+/* global ajaxurl */
</ins><span class="cx"> jQuery(function($){
</span><span class="cx"> $( 'body' ).bind( 'click.wp-gallery', function(e){
</span><span class="cx"> var target = $( e.target ), id, img_size;
</span></span></pre></div>
<a id="trunksrcwpadminjsthemepreviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme-preview.js (26231 => 26232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme-preview.js 2013-11-15 22:28:57 UTC (rev 26231)
+++ trunk/src/wp-admin/js/theme-preview.js 2013-11-15 23:18:18 UTC (rev 26232)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+/* global tb_click */
</ins><span class="cx"> var thickDims, tbWidth, tbHeight;
</span><span class="cx"> jQuery(document).ready(function($) {
</span><span class="cx">
</span><span class="lines">@@ -12,28 +12,31 @@
</span><span class="cx"> tbWindow.width(w).height(h);
</span><span class="cx"> $('#TB_iframeContent').width(w).height(h - 27);
</span><span class="cx"> tbWindow.css({'margin-left': '-' + parseInt((w / 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':'30px','margin-top':'0'});
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> thickDims();
</span><del>- $(window).resize( function() { thickDims() } );
</del><ins>+ $(window).resize( function() { thickDims(); } );
</ins><span class="cx">
</span><span class="cx"> $('a.thickbox-preview').click( function() {
</span><span class="cx"> tb_click.call(this);
</span><span class="cx">
</span><span class="cx"> var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text;
</span><span class="cx">
</span><del>- if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )
</del><ins>+ if ( tbWidth = href.match(/&tbWidth=[0-9]+/) ) {
</ins><span class="cx"> tbWidth = parseInt(tbWidth[0].replace(/[^0-9]+/g, ''), 10);
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> tbWidth = $(window).width() - 90;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( tbHeight = href.match(/&tbHeight=[0-9]+/) )
</del><ins>+ if ( tbHeight = href.match(/&tbHeight=[0-9]+/) ) {
</ins><span class="cx"> tbHeight = parseInt(tbHeight[0].replace(/[^0-9]+/g, ''), 10);
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> tbHeight = $(window).height() - 60;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( alink.length ) {
</span><span class="cx"> url = alink.attr('href') || '';
</span></span></pre>
</div>
</div>
</body>
</html>