Ticket #23560: 23560.26.diff

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

@@ -2504 +2504 @@
 
                                                 // Keep focus inside media modal
                                                 // after canceling a gallery
-                                                new media.view.FocusManager({
-                                                        el: this.el
-                                                }).focus();
+                                                this.controller.modal.focusManager.focus();
                                         }
                                 },
                                 separateCancel: new media.View({
@@ -2695 +2693 @@
 
                                         // Keep focus inside media modal
                                         // after jumping to gallery view
-                                        new media.view.FocusManager({
-                                                el: this.el
-                                        }).focus();
+                                        this.controller.modal.focusManager.focus();
                                 }
                         });
                 },
@@ -2727 +2723 @@
 
                                         // Keep focus inside media modal
                                         // after jumping to playlist view
-                                        new media.view.FocusManager({
-                                                el: this.el
-                                        }).focus();
+                                        this.controller.modal.focusManager.focus();
                                 }
                         });
                 },
@@ -2759 +2753 @@
 
                                         // Keep focus inside media modal
                                         // after jumping to video playlist view
-                                        new media.view.FocusManager({
-                                                el: this.el
-                                        }).focus();
+                                        this.controller.modal.focusManager.focus();
                                 }
                         });
                 },
@@ -6171 +6163 @@
 
                         // Keep focus inside media modal
                         // after clear link is selected
-                        new media.view.FocusManager({
-                                el: this.el
-                        }).focus();
+                        this.controller.modal.focusManager.focus();
                 }
         });
 
@@ -6526 +6516 @@
                                 this.model.destroy();
                                 // Keep focus inside media modal
                                 // after image is deleted
-                                new media.view.FocusManager({
-                                        el: this.el
-                                }).focus();
+                                this.controller.modal.focusManager.focus();
                         }
                 },
                 /**