Changeset 26989

Timestamp:

01/21/2014 04:29:30 PM (11 years ago)

Author:

wonderboymusic

Message:

Disambiguate this and use the @this annotation in media-editor.js. This will become way more necessary in other places, but a few examples here show how confusing it can be.

See #26870.

File:

• trunk/src/wp-includes/js/media-editor.js (modified) (12 diffs)

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

@@ -504 +504 @@
      */
     wp.media.featuredImage = {
+        scott: 'yes',
         /**
          * Get the featured image post ID
@@ -544 +545 @@
          * @global wp.media.view.l10n
          *
+         * @this wp.media.featuredImage
+         *
          * @returns {wp.media.view.MediaFrame.Select} A media workflow.
          */
@@ -557 +560 @@
 
             this._frame.on( 'toolbar:create:featured-image', function( toolbar ) {
+                /**
+                 * @this wp.media.view.MediaFrame.Select
+                 */
                 this.createSelectToolbar( toolbar, {
                     text: wp.media.view.l10n.setFeaturedImage
@@ -567 +573 @@
         /**
          * @global wp.media.view.settings
+         *
+         * @this wp.media.controller.FeaturedImage
          */
         select: function() {
@@ -658 +666 @@
          * @param {Object} [options={}]
          *
+         * @this wp.media.editor
+         *
          * @returns {wp.media.view.MediaFrame.Select} A media workflow.
          */
@@ -685 +695 @@
                 $.when.apply( $, selection.map( function( attachment ) {
                     var display = state.display( attachment ).toJSON();
+                    /**
+                     * @this wp.media.editor
+                     */
                     return this.send.attachment( display, attachment.toJSON() );
                 }, this ) ).done( function() {
@@ -692 +705 @@
 
             workflow.state('gallery-edit').on( 'update', function( selection ) {
+                /**
+                 * @this wp.media.editor
+                 */
                 this.insert( wp.media.gallery.shortcode( selection ).string() );
             }, this );
 
             workflow.state('embed').on( 'select', function() {
+                /**
+                 * @this wp.media.editor
+                 */
                 var state = workflow.state(),
                     type = state.get('type'),
@@ -765 +784 @@
          *
          * @param {string} id
+         *
+         * @this wp.media.editor
+         *
          * @returns {wp.media.view.MediaFrame} A media workflow.
          */
@@ -775 +797 @@
          *
          * @param {string} id
+         *
+         * @this wp.media.editor
          */
         remove: function( id ) {
@@ -862 +886 @@
          * @param {string} id
          * @param {Object} options
+         *
+         * @this wp.media.editor
+         *
          * @returns {wp.media.view.MediaFrame}
          */
@@ -898 +925 @@
         init: function() {
             $(document.body).on( 'click', '.insert-media', function( event ) {
-                var $this = $(this),
-                    editor = $this.data('editor'),
+                var elem = $( event.currentTarget ),
+                    editor = elem.data('editor'),
                     options = {
                         frame:    'post',
@@ -914 +941 @@
                 //
                 // See: http://core.trac.wordpress.org/ticket/22445
-                $this.blur();
-
-                if ( $this.hasClass( 'gallery' ) ) {
+                elem.blur();
+
+                if ( elem.hasClass( 'gallery' ) ) {
                     options.state = 'gallery';
                     options.title = wp.media.view.l10n.createGalleryTitle;