Changeset 27105

Timestamp:

02/06/2014 05:31:22 AM (13 years ago)

Author:

nacin

Message:

JSHint fixes for media-views and Gruntfile.

props gcorne.
fixes #27032, #27033.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-includes/js/media-views.js (modified) (14 diffs)

trunk/Gruntfile.js

@@ -306 +306 @@
                                         src: [
                                                 BUILD_DIR + '/**/*.js',
-                                                '!' + BUILD_DIR + '/wp-content/**/*.js',
+                                                '!' + BUILD_DIR + '/wp-content/**/*.js'
                                         ]
                                 }

trunk/src/wp-includes/js/media-views.js

@@ -45 +45 @@
 
                 if ( $.support.transition ) {
-                        if ( ! (selector instanceof $) )
+                        if ( ! (selector instanceof $) ) {
                                 selector = $( selector );
+                        }
 
                         // Resolve the deferred when the first element finishes animating.
@@ -217 +218 @@
                  * @param {string} id
                  * @returns {wp.media.controller.State} Returns a State model
-                 *       from the StateMachine collection
+                 *   from the StateMachine collection
                  */
                 state: function( id ) {
@@ -270 +271 @@
                  *
                  * @returns {wp.media.controller.State} Returns a State model
-                 *       from the StateMachine collection
+                 *    from the StateMachine collection
                  */
                 lastState: function() {
@@ -536 +537 @@
                         }
 
-                        if ( ! this.get('edge') )
+                        if ( ! this.get('edge') ) {
                                 this.set( 'edge', 120 );
-
-                        if ( ! this.get('gutter') )
+                        }
+
+                        if ( ! this.get('gutter') ) {
                                 this.set( 'gutter', 8 );
+                        }
 
                         this.resetDisplays();
@@ -894 +897 @@
                                 edit    = this.frame.state('gallery-edit').get('library');
 
-                        if ( this.editLibrary && this.editLibrary !== edit )
+                        if ( this.editLibrary && this.editLibrary !== edit ) {
                                 library.unobserve( this.editLibrary );
+                        }
 
                         // Accepts attachments that exist in the original library and
@@ -1138 +1142 @@
                                 scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
                                 scanners.always( function() {
-                                        if ( embed.get('scanners') === scanners )
+                                        if ( embed.get('scanners') === scanners ) {
                                                 embed.set( 'loading', false );
+                                        }
                                 });
                         } else {
@@ -1830 +1835 @@
                                         priority: 20,
                                         click:    function() {
-                                                if ( previous )
+                                                if ( previous ) {
                                                         frame.setState( previous );
-                                                else
+                                                } else {
                                                         frame.close();
+                                                }
                                         }
                                 },
@@ -2496 +2502 @@
                                 // Transition end events are subject to race conditions.
                                 // Make sure that the value is set as intended.
-                                if ( '0' === $el.css('opacity') )
+                                if ( '0' === $el.css('opacity') ) {
                                         $el.hide();
+                                }
                         });
                 }
@@ -3024 +3031 @@
                         _.each( this.defaults, function( def, key ) {
                                 var value = this.options[ key ];
-                                if ( _.isUndefined( value ) )
+                                if ( _.isUndefined( value ) ) {
                                         return;
+                                }
 
                                 this.model.set( key, value );
@@ -3492 +3500 @@
                         options.describe = this.controller.state().get('describe');
 
-                        if ( 'image' === options.type )
+                        if ( 'image' === options.type ) {
                                 options.size = this.imageSize();
+                        }
 
                         options.can = {};
@@ -3501 +3510 @@
                         }
 
-                        if ( this.controller.state().get('allowLocalEdits') )
+                        if ( this.controller.state().get('allowLocalEdits') ) {
                                 options.allowLocalEdits = true;
+                        }
 
                         this.views.detach();
@@ -3508 +3518 @@
 
                         this.$el.toggleClass( 'uploading', options.uploading );
-                        if ( options.uploading )
+                        if ( options.uploading ) {
                                 this.$bar = this.$('.media-progress-bar div');
-                        else
+                        } else {
                                 delete this.$bar;
+                        }
 
                         // Check if the model is selected.
@@ -4035 +4046 @@
 
                 refreshSortable: function() {
-                        if ( ! this.options.sortable || ! $.fn.sortable )
+                        if ( ! this.options.sortable || ! $.fn.sortable ) {
                                 return;
+                        }
 
                         // If the `collection` has a `comparator`, disable sorting.
@@ -4388 +4400 @@
                         if ( ! this.collection.length ) {
                                 this.collection.more().done( function() {
-                                        if ( ! view.collection.length )
+                                        if ( ! view.collection.length ) {
                                                 view.createUploader();
+                                        }
                                 });
                         }