Changeset 29556

Timestamp:

08/20/2014 07:28:11 PM (11 years ago)

Author:

wonderboymusic

Message:

Cleanup after [29220]:

• media.view.Attachment should not reach outside itself with global jQuery selectors
• media.view.Attachment.Details will re-render when media.view.Attachment's single status changes. Add a ready callback to apply initial input focus

See #23560.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (4 diffs)

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

@@ -4894 +4894 @@
                 selection.add( models );
                 selection.single( model );
-
-                // When selecting attachments, focus should be transferred to the right details panel
-                if ( ! isTouchDevice ) {
-                    $('.attachment-details input').first().focus();
-                }
-
                 return;
 
@@ -4907 +4901 @@
                 selection[ this.selected() ? 'remove' : 'add' ]( model );
                 selection.single( model );
-
-                if ( ! isTouchDevice && this.selected() ) {
-                    // When selecting an attachment, focus should be transferred to the right details panel
-                    $('.attachment-details input').first().focus();
-                }
-
                 return;
             } else if ( 'add' === method ) {
@@ -4975 +4963 @@
 
             // Add 'selected' class to model, set aria-checked to true and make the checkbox tabable.
-            this.$el.addClass( 'selected' ).attr( 'aria-checked', true )
-                    .find( '.check' ).attr( 'tabindex', '0' );
-
-            // When selecting an attachment, focus should be transferred to the right details panel.
-            if ( ! isTouchDevice ) {
-                $('.attachment-details input').first().focus();
-            }
+            this.$el.addClass( 'selected' ).attr( 'aria-checked', true ).find( '.check' ).attr( 'tabindex', '0' );
         },
         /**
@@ -6503 +6485 @@
                 rerenderOnModelChange: false
             });
+
+            this.on( 'ready', this.initialFocus );
             /**
              * call 'initialize' directly on the parent class
              */
             media.view.Attachment.prototype.initialize.apply( this, arguments );
+        },
+
+        initialFocus: function() {
+            if ( ! isTouchDevice ) {
+                this.$( ':input' ).eq( 0 ).focus();
+            }
         },
         /**