<!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>[26206] trunk/src/wp-admin/js/customize-controls.js: Fix JSHint errors in customize-controls.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/26206">26206</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-15 06:07:21 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSHint errors in customize-controls.js.
props jorbin.
fixes <a href="http://core.trac.wordpress.org/ticket/25917">#25917</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/customize-controls.js (26205 => 26206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-controls.js 2013-11-15 05:55:24 UTC (rev 26205)
+++ trunk/src/wp-admin/js/customize-controls.js 2013-11-15 06:07:21 UTC (rev 26206)
</span><span class="lines">@@ -8,8 +8,6 @@
</span><span class="cx"> */
</span><span class="cx"> api.Setting = api.Value.extend({
</span><span class="cx"> initialize: function( id, value, options ) {
</span><del>- var element;
-
</del><span class="cx"> api.Value.prototype.initialize.call( this, value, options );
</span><span class="cx">
</span><span class="cx"> this.id = id;
</span><span class="lines">@@ -85,18 +83,17 @@
</span><span class="cx"> ready: function() {},
</span><span class="cx">
</span><span class="cx"> dropdownInit: function() {
</span><del>- var control = this,
- statuses = this.container.find('.dropdown-status'),
- params = this.params,
- update = function( to ) {
- if ( typeof to === 'string' && params.statuses && params.statuses[ to ] )
</del><ins>+ var control = this,
+ statuses = this.container.find('.dropdown-status'),
+ params = this.params,
+ toggleFreeze = false,
+ update = function( to ) {
+ if ( typeof to === 'string' && params.statuses && params.statuses[ to ] )
</ins><span class="cx"> statuses.html( params.statuses[ to ] ).show();
</span><span class="cx"> else
</span><span class="cx"> statuses.hide();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- var toggleFreeze = false;
-
</del><span class="cx"> // Support the .dropdown class to open/close complex elements
</span><span class="cx"> this.container.on( 'click keydown', '.dropdown', function( event ) {
</span><span class="cx"> if ( event.type === 'keydown' && 13 !== event.which ) // enter
</span><span class="lines">@@ -128,12 +125,12 @@
</span><span class="cx"> picker = this.container.find('.color-picker-hex');
</span><span class="cx">
</span><span class="cx"> picker.val( control.setting() ).wpColorPicker({
</span><del>- change: function( event, options ) {
</del><ins>+ change: function() {
</ins><span class="cx"> control.setting.set( picker.wpColorPicker('color') );
</span><del>- },
- clear: function() {
- control.setting.set( false );
- }
</del><ins>+ },
+ clear: function() {
+ control.setting.set( false );
+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -197,7 +194,7 @@
</span><span class="cx"> panels;
</span><span class="cx">
</span><span class="cx"> this.uploader = {
</span><del>- init: function( up ) {
</del><ins>+ init: function() {
</ins><span class="cx"> var fallback, button;
</span><span class="cx">
</span><span class="cx"> if ( this.supports.dragdrop )
</span><span class="lines">@@ -319,8 +316,7 @@
</span><span class="cx"> sensitivity: 2000,
</span><span class="cx">
</span><span class="cx"> initialize: function( params, options ) {
</span><del>- var deferred = $.Deferred(),
- self = this;
</del><ins>+ var deferred = $.Deferred();
</ins><span class="cx">
</span><span class="cx"> // This is the promise object.
</span><span class="cx"> deferred.promise( this );
</span><span class="lines">@@ -488,8 +484,7 @@
</span><span class="cx"> */
</span><span class="cx"> initialize: function( params, options ) {
</span><span class="cx"> var self = this,
</span><del>- rscheme = /^https?/,
- url;
</del><ins>+ rscheme = /^https?/;
</ins><span class="cx">
</span><span class="cx"> $.extend( this, options || {} );
</span><span class="cx">
</span><span class="lines">@@ -706,9 +701,9 @@
</span><span class="cx"> if ( ! $.support.postMessage || ( ! $.support.cors && api.settings.isCrossDomain ) )
</span><span class="cx"> return window.location = api.settings.url.fallback;
</span><span class="cx">
</span><del>- var body = $( document.body ),
- overlay = body.children('.wp-full-overlay'),
- query, previewer, parent;
</del><ins>+ var previewer, parent, topFocus,
+ body = $( document.body ),
+ overlay = body.children('.wp-full-overlay');
</ins><span class="cx">
</span><span class="cx"> // Prevent the form from saving when enter is pressed.
</span><span class="cx"> $('#customize-controls').on( 'keydown', function( e ) {
</span><span class="lines">@@ -733,9 +728,9 @@
</span><span class="cx"> query: function() {
</span><span class="cx"> return {
</span><span class="cx"> wp_customize: 'on',
</span><del>- theme: api.settings.theme.stylesheet,
- customized: JSON.stringify( api.get() ),
- nonce: this.nonce.preview
</del><ins>+ theme: api.settings.theme.stylesheet,
+ customized: JSON.stringify( api.get() ),
+ nonce: this.nonce.preview
</ins><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -778,9 +773,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Refresh the nonces if the preview sends updated nonces over.
</span><del>- previewer.bind( 'nonce', function( nonce ) {
- $.extend( this.nonce, nonce );
- });
</del><ins>+ previewer.bind( 'nonce', function( nonce ) {
+ $.extend( this.nonce, nonce );
+ });
</ins><span class="cx">
</span><span class="cx"> $.each( api.settings.settings, function( id, data ) {
</span><span class="cx"> api.create( id, id, data.value, {
</span><span class="lines">@@ -920,15 +915,15 @@
</span><span class="cx"> $.each({
</span><span class="cx"> 'background_image': {
</span><span class="cx"> controls: [ 'background_repeat', 'background_position_x', 'background_attachment' ],
</span><del>- callback: function( to ) { return !! to }
</del><ins>+ callback: function( to ) { return !! to; }
</ins><span class="cx"> },
</span><span class="cx"> 'show_on_front': {
</span><span class="cx"> controls: [ 'page_on_front', 'page_for_posts' ],
</span><del>- callback: function( to ) { return 'page' === to }
</del><ins>+ callback: function( to ) { return 'page' === to; }
</ins><span class="cx"> },
</span><span class="cx"> 'header_textcolor': {
</span><span class="cx"> controls: [ 'header_textcolor' ],
</span><del>- callback: function( to ) { return 'blank' !== to }
</del><ins>+ callback: function( to ) { return 'blank' !== to; }
</ins><span class="cx"> }
</span><span class="cx"> }, function( settingId, o ) {
</span><span class="cx"> api( settingId, function( setting ) {
</span><span class="lines">@@ -973,7 +968,7 @@
</span><span class="cx"> control.settings.data.set( false );
</span><span class="cx"> });
</span><span class="cx">
</span><del>- control.library.on( 'click', 'a', function( event ) {
</del><ins>+ control.library.on( 'click', 'a', function() {
</ins><span class="cx"> control.settings.data.set( $(this).data('customizeHeaderImageData') );
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -998,7 +993,7 @@
</span><span class="cx"> api.trigger( 'ready' );
</span><span class="cx">
</span><span class="cx"> // Make sure left column gets focus
</span><del>- var topFocus = $('.back');
</del><ins>+ topFocus = $('.back');
</ins><span class="cx"> topFocus.focus();
</span><span class="cx"> setTimeout(function () {
</span><span class="cx"> topFocus.focus();
</span></span></pre>
</div>
</div>
</body>
</html>