<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42627] branches/4.9: Media: avoid page scrolling when opening the media modal.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42627">42627</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42627","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-31 23:54:02 +0000 (Wed, 31 Jan 2018)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: avoid page scrolling when opening the media modal.

Moves focus to a proper element within the media modal to avoid the underlying
page to scroll to the bottom. Removes the media modal `freeze` option.

Props andreiglingeanu, adamsilverstein.
Merges <a href="https://core.trac.wordpress.org/changeset/42624">[42624]</a> to the 4.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/39859">#39859</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpincludesjsmediaviewsmodaljs">branches/4.9/src/wp-includes/js/media/views/modal.js</a></li>
<li><a href="#branches49srcwpincludesjsmediaviewsjs">branches/4.9/src/wp-includes/js/media-views.js</a></li>
<li><a href="#branches49srcwpincludesmediatemplatephp">branches/4.9/src/wp-includes/media-template.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.9 2018-01-31 22:27:43 UTC (rev 42626)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9  2018-01-31 23:54:02 UTC (rev 42627)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42258-42261,42350,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42625
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42258-42261,42350,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpincludesjsmediaviewsmodaljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/js/media/views/modal.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/js/media/views/modal.js      2018-01-31 22:27:43 UTC (rev 42626)
+++ branches/4.9/src/wp-includes/js/media/views/modal.js        2018-01-31 23:54:02 UTC (rev 42627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        tagName:  'div',
</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template('media-modal'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        attributes: {
-               tabindex: 0
-       },
-
</del><span class="cx" style="display: block; padding: 0 10px">         events: {
</span><span class="cx" style="display: block; padding: 0 10px">                'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
</span><span class="cx" style="display: block; padding: 0 10px">                'keydown': 'keydown'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        container: document.body,
</span><span class="cx" style="display: block; padding: 0 10px">                        title:     '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        propagate: true,
-                       freeze:    true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 propagate: true
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.focusManager = new wp.media.view.FocusManager({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +83,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        open: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var $el = this.$el,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        options = this.options,
</del><span class="cx" style="display: block; padding: 0 10px">                         mceEditor;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $el.is(':visible') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,13 +95,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        this.attach();
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the `freeze` option is set, record the window's scroll position.
-               if ( options.freeze ) {
-                       this._freeze = {
-                               scrollTop: $( window ).scrollTop()
-                       };
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 // Disable page scrolling.
</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).addClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Try to close the onscreen keyboard
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'ontouchend' in document ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor ) && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 mceEditor.iframeElement.focus();
</span><span class="cx" style="display: block; padding: 0 10px">                                mceEditor.iframeElement.blur();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.$el.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set initial focus on the content instead of this view element, to avoid page scrolling.
+               this.$( '.media-modal' ).focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return this.propagate('open');
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,8 +123,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.view.Modal} Returns itself to allow chaining
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        close: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var freeze = this._freeze;
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( ! this.views.attached || ! this.$el.is(':visible') ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return this;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,11 +142,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.propagate('close');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the `freeze` option is set, restore the container's scroll position.
-               if ( freeze ) {
-                       $( window ).scrollTop( freeze.scrollTop );
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( options && options.escape ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        this.propagate('escape');
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="branches49srcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/js/media-views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/js/media-views.js    2018-01-31 22:27:43 UTC (rev 42626)
+++ branches/4.9/src/wp-includes/js/media-views.js      2018-01-31 23:54:02 UTC (rev 42627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4173,10 +4173,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        tagName:  'div',
</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template('media-modal'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        attributes: {
-               tabindex: 0
-       },
-
</del><span class="cx" style="display: block; padding: 0 10px">         events: {
</span><span class="cx" style="display: block; padding: 0 10px">                'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
</span><span class="cx" style="display: block; padding: 0 10px">                'keydown': 'keydown'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4188,8 +4184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        container: document.body,
</span><span class="cx" style="display: block; padding: 0 10px">                        title:     '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        propagate: true,
-                       freeze:    true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 propagate: true
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.focusManager = new wp.media.view.FocusManager({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4244,7 +4239,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        open: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var $el = this.$el,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        options = this.options,
</del><span class="cx" style="display: block; padding: 0 10px">                         mceEditor;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $el.is(':visible') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4257,13 +4251,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        this.attach();
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the `freeze` option is set, record the window's scroll position.
-               if ( options.freeze ) {
-                       this._freeze = {
-                               scrollTop: $( window ).scrollTop()
-                       };
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 // Disable page scrolling.
</span><span class="cx" style="display: block; padding: 0 10px">                $( 'body' ).addClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4271,7 +4258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Try to close the onscreen keyboard
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'ontouchend' in document ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor ) && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 mceEditor.iframeElement.focus();
</span><span class="cx" style="display: block; padding: 0 10px">                                mceEditor.iframeElement.blur();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4281,7 +4268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.$el.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Set initial focus on the content instead of this view element, to avoid page scrolling.
+               this.$( '.media-modal' ).focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return this.propagate('open');
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4291,8 +4279,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.view.Modal} Returns itself to allow chaining
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        close: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var freeze = this._freeze;
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( ! this.views.attached || ! this.$el.is(':visible') ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return this;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4312,11 +4298,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.propagate('close');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the `freeze` option is set, restore the container's scroll position.
-               if ( freeze ) {
-                       $( window ).scrollTop( freeze.scrollTop );
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( options && options.escape ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        this.propagate('escape');
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="branches49srcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/media-template.php   2018-01-31 22:27:43 UTC (rev 42626)
+++ branches/4.9/src/wp-includes/media-template.php     2018-01-31 23:54:02 UTC (rev 42627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        </script>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        <script type="text/html" id="tmpl-media-modal">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <div class="<?php echo $class; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div tabindex="0" class="<?php echo $class; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px">                         <button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></button>
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="media-modal-content"></div>
</span><span class="cx" style="display: block; padding: 0 10px">                </div>
</span></span></pre>
</div>
</div>

</body>
</html>