Changeset 40821

Timestamp:

05/22/2017 10:04:03 PM (9 years ago)

Author:

westonruter

Message:

Widgets: Further refine WP JS coding style in media widgets code.

Props afercia.
See #32417.

Location:

trunk/src/wp-admin/js/widgets

Files:

• media-audio-widget.js (modified) (8 diffs)
• media-video-widget.js (modified) (8 diffs)
• media-widgets.js (modified) (8 diffs)
• text-widgets.js (modified) (3 diffs)

trunk/src/wp-admin/js/widgets/media-audio-widget.js

@@ -20 +20 @@
                 createStates: function createStates() {
                         this.states.add([
-                                new wp.media.controller.AudioDetails( {
+                                new wp.media.controller.AudioDetails({
                                         media: this.media
-                                } ),
+                                }),
 
-                                new wp.media.controller.MediaLibrary( {
+                                new wp.media.controller.MediaLibrary({
                                         type: 'audio',
                                         id: 'add-audio-source',
@@ -31 +31 @@
                                         media: this.media,
                                         menu: false
-                                } )
+                                })
                         ]);
                 }
@@ -44 +44 @@
          * @constructor
          */
-        AudioWidgetModel = component.MediaWidgetModel.extend( {} );
+        AudioWidgetModel = component.MediaWidgetModel.extend({});
 
         /**
@@ -54 +54 @@
          * @constructor
          */
-        AudioWidgetControl = component.MediaWidgetControl.extend( {
+        AudioWidgetControl = component.MediaWidgetControl.extend({
 
                 /**
@@ -93 +93 @@
                         previewTemplate = wp.template( 'wp-media-widget-audio-preview' );
 
-                        previewContainer.html( previewTemplate( {
+                        previewContainer.html( previewTemplate({
                                 model: {
                                         attachment_id: control.model.get( 'attachment_id' ),
@@ -99 +99 @@
                                 },
                                 error: control.model.get( 'error' )
-                        } ) );
+                        }));
                         wp.mediaelement.initialize();
                 },
@@ -118 +118 @@
                                 state: 'audio-details',
                                 metadata: metadata
-                        } );
+                        });
                         wp.media.frame = mediaFrame;
                         mediaFrame.$el.addClass( 'media-widget' );
@@ -142 +142 @@
                         mediaFrame.open();
                 }
-        } );
+        });
 
         // Exports.

trunk/src/wp-admin/js/widgets/media-video-widget.js

@@ -24 +24 @@
                                 }),
 
-                                new wp.media.controller.MediaLibrary( {
+                                new wp.media.controller.MediaLibrary({
                                         type: 'video',
                                         id: 'add-video-source',
@@ -31 +31 @@
                                         media: this.media,
                                         menu: false
-                                } ),
-
-                                new wp.media.controller.MediaLibrary( {
+                                }),
+
+                                new wp.media.controller.MediaLibrary({
                                         type: 'text',
                                         id: 'add-track',
@@ -40 +40 @@
                                         media: this.media,
                                         menu: 'video-details'
-                                } )
+                                })
                         ]);
                 }
@@ -53 +53 @@
          * @constructor
          */
-        VideoWidgetModel = component.MediaWidgetModel.extend( {} );
+        VideoWidgetModel = component.MediaWidgetModel.extend({});
 
         /**
@@ -63 +63 @@
          * @constructor
          */
-        VideoWidgetControl = component.MediaWidgetControl.extend( {
+        VideoWidgetControl = component.MediaWidgetControl.extend({
 
                 /**
@@ -182 +182 @@
                         previewTemplate = wp.template( 'wp-media-widget-video-preview' );
 
-                        previewContainer.html( previewTemplate( {
+                        previewContainer.html( previewTemplate({
                                 model: {
                                         attachment_id: control.model.get( 'attachment_id' ),
@@ -190 +190 @@
                                 is_hosted_embed: isHostedEmbed,
                                 error: error
-                        } ) );
+                        }));
                         wp.mediaelement.initialize();
                 },
@@ -233 +233 @@
                         mediaFrame.open();
                 }
-        } );
+        });
 
         // Exports.

trunk/src/wp-admin/js/widgets/media-widgets.js

@@ -135 +135 @@
                                                         noticeContainer.append( $( '<p>', {
                                                                 html: notice
-                                                        } ) );
+                                                        }));
                                                         noticeContainer.slideDown( 'fast' );
                                                 }
@@ -218 +218 @@
                                          * @returns {void}
                                          */
-                                        renderFail: function renderFail(  ) {
+                                        renderFail: function renderFail() {
                                                 var embedLinkView = this; // eslint-disable-line consistent-this
                                                 $( '#embed-url-field' ).addClass( 'invalid' );
@@ -231 +231 @@
                                 model:      this.model.props,
                                 priority:   40
-                        }) );
+                        }));
                 }
         });
@@ -259 +259 @@
                         }
 
-                        this.states.add( [
+                        this.states.add([
 
                                 // Main states.
@@ -288 +288 @@
                                         invalidEmbedTypeError: this.options.invalidEmbedTypeError
                                 })
-                        ] );
+                        ]);
                 },
 
@@ -644 +644 @@
 
                         if ( control.isSelected() && 0 !== control.model.get( 'attachment_id' ) ) {
-                                selection = new wp.media.model.Selection( [ control.selectedAttachment ] );
+                                selection = new wp.media.model.Selection([ control.selectedAttachment ]);
                         } else {
                                 selection = null;
@@ -746 +746 @@
                                         control.model.getEmbedResetProps()
                                 );
-                        }  else {
+                        } else {
                                 throw new Error( 'Unexpected state: ' + state.get( 'id' ) );
                         }
@@ -761 +761 @@
                                         modelProps[ ext ] = '';
                                 }
-                        } );
+                        });
 
                         return modelProps;

trunk/src/wp-admin/js/widgets/text-widgets.js

@@ -126 +126 @@
 
                                 // Destroy any existing editor so that it can be re-initialized after a widget-updated event.
-                                if ( tinymce.get( id ) )    {
+                                if ( tinymce.get( id ) ) {
                                         restoreTextMode = tinymce.get( id ).isHidden();
                                         wp.editor.remove( id );
@@ -136 +136 @@
                                         },
                                         quicktags: true
-                                } );
+                                });
 
                                 editor = window.tinymce.get( id );
@@ -191 +191 @@
                                 editor.on( 'focus', function() {
                                         control.editorFocused = true;
-                                } );
+                                });
                                 editor.on( 'NodeChange', _.debounce( triggerChangeIfDirty, changeDebounceDelay ) );
                                 editor.on( 'blur', function() {
                                         control.editorFocused = false;
                                         triggerChangeIfDirty();
-                                } );
+                                });
 
                                 control.editor = editor;