<!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>[27105] trunk: JSHint fixes for media-views and Gruntfile.</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/27105">27105</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-02-06 05:31:22 +0000 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSHint fixes for media-views and Gruntfile.
props gcorne.
fixes <a href="http://core.trac.wordpress.org/ticket/27032">#27032</a>, <a href="http://core.trac.wordpress.org/ticket/27033">#27033</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4>Modified: trunk/Gruntfile.js (27104 => 27105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Gruntfile.js 2014-02-06 05:19:05 UTC (rev 27104)
+++ trunk/Gruntfile.js 2014-02-06 05:31:22 UTC (rev 27105)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> files: {
</span><span class="cx"> src: [
</span><span class="cx"> BUILD_DIR + '/**/*.js',
</span><del>- '!' + BUILD_DIR + '/wp-content/**/*.js',
</del><ins>+ '!' + BUILD_DIR + '/wp-content/**/*.js'
</ins><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27104 => 27105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-02-06 05:19:05 UTC (rev 27104)
+++ trunk/src/wp-includes/js/media-views.js 2014-02-06 05:31:22 UTC (rev 27105)
</span><span class="lines">@@ -44,8 +44,9 @@
</span><span class="cx"> sensitivity = sensitivity || 2000;
</span><span class="cx">
</span><span class="cx"> if ( $.support.transition ) {
</span><del>- if ( ! (selector instanceof $) )
</del><ins>+ if ( ! (selector instanceof $) ) {
</ins><span class="cx"> selector = $( selector );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Resolve the deferred when the first element finishes animating.
</span><span class="cx"> selector.first().one( $.support.transition.end, deferred.resolve );
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param {string} id
</span><span class="cx"> * @returns {wp.media.controller.State} Returns a State model
</span><del>- * from the StateMachine collection
</del><ins>+ * from the StateMachine collection
</ins><span class="cx"> */
</span><span class="cx"> state: function( id ) {
</span><span class="cx"> this.states = this.states || new Backbone.Collection();
</span><span class="lines">@@ -269,7 +270,7 @@
</span><span class="cx"> * active state.
</span><span class="cx"> *
</span><span class="cx"> * @returns {wp.media.controller.State} Returns a State model
</span><del>- * from the StateMachine collection
</del><ins>+ * from the StateMachine collection
</ins><span class="cx"> */
</span><span class="cx"> lastState: function() {
</span><span class="cx"> if ( this._lastState ) {
</span><span class="lines">@@ -535,11 +536,13 @@
</span><span class="cx"> }) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! this.get('edge') )
</del><ins>+ if ( ! this.get('edge') ) {
</ins><span class="cx"> this.set( 'edge', 120 );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( ! this.get('gutter') )
</del><ins>+ if ( ! this.get('gutter') ) {
</ins><span class="cx"> this.set( 'gutter', 8 );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.resetDisplays();
</span><span class="cx"> },
</span><span class="lines">@@ -893,8 +896,9 @@
</span><span class="cx"> var library = this.get('library'),
</span><span class="cx"> edit = this.frame.state('gallery-edit').get('library');
</span><span class="cx">
</span><del>- if ( this.editLibrary && this.editLibrary !== edit )
</del><ins>+ if ( this.editLibrary && this.editLibrary !== edit ) {
</ins><span class="cx"> library.unobserve( this.editLibrary );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Accepts attachments that exist in the original library and
</span><span class="cx"> // that do not exist in gallery's library.
</span><span class="lines">@@ -1137,8 +1141,9 @@
</span><span class="cx"> if ( attributes.scanners.length ) {
</span><span class="cx"> scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
</span><span class="cx"> scanners.always( function() {
</span><del>- if ( embed.get('scanners') === scanners )
</del><ins>+ if ( embed.get('scanners') === scanners ) {
</ins><span class="cx"> embed.set( 'loading', false );
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> attributes.scanners = null;
</span><span class="lines">@@ -1829,10 +1834,11 @@
</span><span class="cx"> text: l10n.cancelGalleryTitle,
</span><span class="cx"> priority: 20,
</span><span class="cx"> click: function() {
</span><del>- if ( previous )
</del><ins>+ if ( previous ) {
</ins><span class="cx"> frame.setState( previous );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> frame.close();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> separateCancel: new media.View({
</span><span class="lines">@@ -2495,8 +2501,9 @@
</span><span class="cx"> media.transition( $el ).done( function() {
</span><span class="cx"> // Transition end events are subject to race conditions.
</span><span class="cx"> // Make sure that the value is set as intended.
</span><del>- if ( '0' === $el.css('opacity') )
</del><ins>+ if ( '0' === $el.css('opacity') ) {
</ins><span class="cx"> $el.hide();
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -3023,8 +3030,9 @@
</span><span class="cx"> // value to the `model` and remove it from the `options object.
</span><span class="cx"> _.each( this.defaults, function( def, key ) {
</span><span class="cx"> var value = this.options[ key ];
</span><del>- if ( _.isUndefined( value ) )
</del><ins>+ if ( _.isUndefined( value ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.model.set( key, value );
</span><span class="cx"> delete this.options[ key ];
</span><span class="lines">@@ -3491,8 +3499,9 @@
</span><span class="cx"> options.buttons = this.buttons;
</span><span class="cx"> options.describe = this.controller.state().get('describe');
</span><span class="cx">
</span><del>- if ( 'image' === options.type )
</del><ins>+ if ( 'image' === options.type ) {
</ins><span class="cx"> options.size = this.imageSize();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> options.can = {};
</span><span class="cx"> if ( options.nonces ) {
</span><span class="lines">@@ -3500,17 +3509,19 @@
</span><span class="cx"> options.can.save = !! options.nonces.update;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( this.controller.state().get('allowLocalEdits') )
</del><ins>+ if ( this.controller.state().get('allowLocalEdits') ) {
</ins><span class="cx"> options.allowLocalEdits = true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.views.detach();
</span><span class="cx"> this.$el.html( this.template( options ) );
</span><span class="cx">
</span><span class="cx"> this.$el.toggleClass( 'uploading', options.uploading );
</span><del>- if ( options.uploading )
</del><ins>+ if ( options.uploading ) {
</ins><span class="cx"> this.$bar = this.$('.media-progress-bar div');
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> delete this.$bar;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Check if the model is selected.
</span><span class="cx"> this.updateSelect();
</span><span class="lines">@@ -4034,8 +4045,9 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refreshSortable: function() {
</span><del>- if ( ! this.options.sortable || ! $.fn.sortable )
</del><ins>+ if ( ! this.options.sortable || ! $.fn.sortable ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // If the `collection` has a `comparator`, disable sorting.
</span><span class="cx"> var collection = this.collection,
</span><span class="lines">@@ -4387,8 +4399,9 @@
</span><span class="cx">
</span><span class="cx"> if ( ! this.collection.length ) {
</span><span class="cx"> this.collection.more().done( function() {
</span><del>- if ( ! view.collection.length )
</del><ins>+ if ( ! view.collection.length ) {
</ins><span class="cx"> view.createUploader();
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>