<!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>[32952] trunk/src: In Media microtemplates after [32467], use `<button>` instead of `<a>` for several more non-links.</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/32952">32952</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/32952","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-26 05:00:42 +0000 (Fri, 26 Jun 2015)</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'>In Media microtemplates after <a href="https://core.trac.wordpress.org/changeset/32467">[32467]</a>, use `<button>` instead of `<a>` for several more non-links.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/26550">#26550</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpincludescssbuttonscss">trunk/src/wp-includes/css/buttons.css</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentdetailsjs">trunk/src/wp-includes/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentjs">trunk/src/wp-includes/js/media/views/attachment.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaelementwpmediaelementcss">trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssmediacss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/media.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/media.css 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-admin/css/media.css 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,13 +485,14 @@
</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"> .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-size: 0;
- top: 0;
- right: -6px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: -10px;
+ right: -14px;
+ padding: 10px;
</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"> .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f153";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: block;
</ins><span class="cx" style="display: block; padding: 0 10px"> font: normal 16px/1 dashicons;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #bbb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,11 +637,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 22px;
</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">-.upload-php .media-modal-close .media-modal-icon {
- margin: 14px;
- width: 22px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .upload-php .media-modal-close,
</span><span class="cx" style="display: block; padding: 0 10px"> .edit-attachment-frame .edit-media-header .left,
</span><span class="cx" style="display: block; padding: 0 10px"> .edit-attachment-frame .edit-media-header .right {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -693,6 +689,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: #ccc;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #000;
</span><span class="cx" style="display: block; padding: 0 10px"> outline: none;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: none;
+ box-shadow: none;
</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"> .upload-php .media-modal-close:focus .media-modal-icon:before,
</span></span></pre></div>
<a id="trunksrcwpincludescssbuttonscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/buttons.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/buttons.css 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/css/buttons.css 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +100,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.ie8 .wp-core-ui .button-link:focus {
+ outline: #5b9dd9 solid 1px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button.hidden {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +140,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> vertical-align: baseline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .button-link {
+ border: 0;
+ background: none;
+ outline: none;
+ cursor: pointer;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button.hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button-secondary:hover,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +160,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button.focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button:focus,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-core-ui .button-secondary:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .button-secondary:focus,
+.wp-core-ui .button-link:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow:
</span><span class="cx" style="display: block; padding: 0 10px"> 0 0 0 1px #5b9dd9,
</span><span class="cx" style="display: block; padding: 0 10px"> 0 0 2px 1px rgba(30, 140, 190, .8);
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/media-views.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/media-views.css 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/css/media-views.css 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,11 +153,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .media-modal-close {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-decoration: none;
- top: 10px;
- right: 10px;
- width: 30px;
- height: 30px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: 0;
+ right: 0;
+ width: 50px;
+ height: 50px;
+ padding: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> z-index: 1000;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx" style="display: block; padding: 0 10px"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,12 +169,7 @@
</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"> .media-modal-close span.media-modal-icon {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display: block;
- margin-top: 5px;
- width: 30px;
- height: 15px;
</del><span class="cx" style="display: block; padding: 0 10px"> background-image: none;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-align: center;
</del><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"> .media-modal-close .media-modal-icon:before {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +204,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-font-smoothing: subpixel-antialiased;
</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">-.media-modal-icon {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* higher specificity */
+.wp-core-ui .media-modal-icon {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-image: url(../images/uploader-icons.png);
</span><span class="cx" style="display: block; padding: 0 10px"> background-repeat: no-repeat;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,7 +931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</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">-.wp-core-ui .attachment .close {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment-close {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 5px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,36 +939,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 22px;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 22px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-size: 20px;
- line-height: 20px;
- text-align: center;
- text-decoration: none;
- color: #464646;
</del><span class="cx" style="display: block; padding: 0 10px"> background-color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> background-position: -96px 4px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-width: 0;
</del><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -webkit-transition-duration: none;
- transition-duration: none;
- -webkit-transition-property: none;
- transition-property: none;
</del><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">-.wp-core-ui .attachment a.close:hover,
-.wp-core-ui .attachment a.close:focus {
- -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
- box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment-close:hover,
+.wp-core-ui .attachment-close:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-position: -36px 4px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> .wp-core-ui .attachment .check {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 24px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 10;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,14 +967,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 0 0 1px #fff, 0 0 0 2px rgba( 0, 0, 0, 0.15 );
</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">-.wp-core-ui .attachment .check div {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment .check .media-modal-icon {
+ display: block;
</ins><span class="cx" style="display: block; padding: 0 10px"> background-position: -1px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 15px;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 15px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 5px;
</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">-.wp-core-ui .attachment .check:hover div {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment .check:hover .media-modal-icon {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-position: -40px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,14 +995,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 0 0 0 2px #1e8cbe;
</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">-.wp-core-ui .attachment.details .check div,
-.wp-core-ui .media-frame.mode-grid .attachment.selected .check div {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment.details .check .media-modal-icon,
+.wp-core-ui .media-frame.mode-grid .attachment.selected .check .media-modal-icon {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-position: -21px 0;
</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">-.wp-core-ui .attachment.details .check:hover div,
-.wp-core-ui .attachment.selected .check:focus div,
-.wp-core-ui .media-frame.mode-grid .attachment.selected .check:hover div {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-core-ui .attachment.details .check:hover .media-modal-icon,
+.wp-core-ui .attachment.selected .check:focus .media-modal-icon,
+.wp-core-ui .media-frame.mode-grid .attachment.selected .check:hover .media-modal-icon {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-position: -60px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,34 +1376,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</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">-.media-selection .selection-info a {
- display: block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-selection .button-link {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 1px 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 1px 8px 1px -8px;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 16px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-decoration: none;
</del><span class="cx" style="display: block; padding: 0 10px"> border-right: 1px solid #dfdfdf;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #21759B;
</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">-.media-selection .selection-info a:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-selection .button-link:hover,
+.media-selection .button-link:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #21759B;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: transparent;
</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">-.media-selection .selection-info a:last-child {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-selection .button-link:last-child {
</ins><span class="cx" style="display: block; padding: 0 10px"> border-right: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 0;
</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">-.media-selection .selection-info .clear-selection {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.selection-info .clear-selection {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: red;
</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">-.media-selection .selection-info .clear-selection:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.selection-info .clear-selection:hover,
+.selection-info .clear-selection:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: red;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #fff;
</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"> .media-selection .selection-view {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1640,12 +1626,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .media-modal .delete-attachment,
</span><span class="cx" style="display: block; padding: 0 10px"> .media-modal .trash-attachment,
</span><span class="cx" style="display: block; padding: 0 10px"> .media-modal .untrash-attachment {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: inline;
+ padding: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #bc0b0b;
</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"> .media-modal .delete-attachment:hover,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-modal .delete-attachment:focus,
</ins><span class="cx" style="display: block; padding: 0 10px"> .media-modal .trash-attachment:hover,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.media-modal .untrash-attachment:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-modal .trash-attachment:focus,
+.media-modal .untrash-attachment:hover,
+.media-modal .untrash-attachment:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: red;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1891,9 +1882,9 @@
</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"> .image-details .advanced-toggle {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- text-decoration: none;
- display: block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ text-transform: uppercase;
</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"> .image-details .advanced-toggle:after {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/details.js 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/js/media/views/attachment/details.js 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialFocus: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp.media.isTouchDevice ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( ':input' ).eq( 0 ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ Previously focused the first ':input' (the readonly URL text field).
+ Since the first ':input' is now a button (delete/trash): when pressing
+ spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
+ as soon as focus is moved. Explicitly target the first text field for now.
+ @todo change initial focus logic, also for accessibility.
+ */
+ this.$( 'input[type="text"]' ).eq( 0 ).focus();
</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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment.js 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/js/media/views/attachment.js 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,10 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] input': 'updateSetting',
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] select': 'updateSetting',
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] textarea': 'updateSetting',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'click .close': 'removeFromLibrary',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'click .attachment-close': 'removeFromLibrary',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'click .check': 'checkClickHandler',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'click a': 'preventDefault',
- 'keydown .close': 'removeFromLibrary',
</del><span class="cx" style="display: block; padding: 0 10px"> 'keydown': 'toggleSelectionHandler'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,8 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> toggleSelectionHandler: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var method;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't do anything inside inputs.
- if ( 'INPUT' === event.target.nodeName ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't do anything inside inputs and on the attachment check and remove buttons.
+ if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,12 +349,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.toggleClass( 'details', details === this.model );
</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">- * @param {Object} event
- */
- preventDefault: function( event ) {
- event.preventDefault();
- },
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @param {string} size
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {Object}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media-views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-views.js 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/js/media-views.js 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2625,10 +2625,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] input': 'updateSetting',
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] select': 'updateSetting',
</span><span class="cx" style="display: block; padding: 0 10px"> 'change [data-setting] textarea': 'updateSetting',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'click .close': 'removeFromLibrary',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'click .attachment-close': 'removeFromLibrary',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'click .check': 'checkClickHandler',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'click a': 'preventDefault',
- 'keydown .close': 'removeFromLibrary',
</del><span class="cx" style="display: block; padding: 0 10px"> 'keydown': 'toggleSelectionHandler'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2756,8 +2754,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> toggleSelectionHandler: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var method;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't do anything inside inputs.
- if ( 'INPUT' === event.target.nodeName ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't do anything inside inputs and on the attachment check and remove buttons.
+ if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2943,12 +2941,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.toggleClass( 'details', details === this.model );
</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">- * @param {Object} event
- */
- preventDefault: function( event ) {
- event.preventDefault();
- },
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @param {string} size
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {Object}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3197,7 +3189,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialFocus: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp.media.isTouchDevice ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( ':input' ).eq( 0 ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ Previously focused the first ':input' (the readonly URL text field).
+ Since the first ':input' is now a button (delete/trash): when pressing
+ spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
+ as soon as focus is moved. Explicitly target the first text field for now.
+ @todo change initial focus logic, also for accessibility.
+ */
+ this.$( 'input[type="text"]' ).eq( 0 ).focus();
</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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaelementwpmediaelementcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,12 +106,16 @@
</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"> .media-embed-details .setting p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.media-embed-details .setting a {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-embed-details .setting .remove-setting {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #a00;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> text-transform: uppercase;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-embed-details .setting .remove-setting {
+ padding: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .media-embed-details .setting a:hover {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #f00;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2015-06-26 04:39:11 UTC (rev 32951)
+++ trunk/src/wp-includes/media-template.php 2015-06-26 05:00:42 UTC (rev 32952)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <div class="<?php echo $class; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="media-modal-close" href="#"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close media panel' ); ?></span></span></button>
</ins><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 class="cx" style="display: block; padding: 0 10px"> <div class="media-modal-backdrop"></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</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-uploader-status">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Uploading' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="upload-dismiss-errors" href="#"><?php _e('Dismiss Errors'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="upload-details">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,12 +434,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ! data.uploading && data.can.remove ) { #> |
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( MEDIA_TRASH ): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'trash' === data.status ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="trash-attachment" href="#"><?php _ex( 'Trash', 'verb' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else: ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,11 +470,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.buttons.close ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="close media-modal-icon" href="#" title="<?php esc_attr_e('Remove'); ?>"></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e( 'Remove' ); ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.buttons.check ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="check" href="#" title="<?php esc_attr_e('Deselect'); ?>" tabindex="-1"><div class="media-modal-icon"></div></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button>
</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"> var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -536,12 +536,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ! data.uploading && data.can.remove ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( MEDIA_TRASH ): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'trash' === data.status ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="trash-attachment" href="#"><?php _ex( 'Trash', 'verb' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else: ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,10 +595,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="selection-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="count"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.editable ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="edit-selection" href="#"><?php _e( 'Edit Selection' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link edit-selection"><?php _e( 'Edit Selection' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.clearable ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="clear-selection" href="#"><?php _e('Clear'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link clear-selection"><?php _e( 'Clear' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="selection-view"></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,7 +991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="link-to-custom" data-setting="linkUrl" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="advanced-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><a class="advanced-toggle" href="#"><?php _e('Advanced Options'); ?></a></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="advanced-settings hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="advanced-image">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting title-text">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,7 +1048,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting">
</span><span class="cx" style="display: block; padding: 0 10px"> <span>SRC</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting"><?php _e( 'Remove' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,7 +1062,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php echo strtoupper( $type ) ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting"><?php _e( 'Remove' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting">
</span><span class="cx" style="display: block; padding: 0 10px"> <span>SRC</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" disabled="disabled" data-setting="src" value="{{ data.model.src }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting"><?php _e( 'Remove' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $video_types as $type ):
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1143,7 +1143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php echo strtoupper( $type ) ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting"><?php _e( 'Remove' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1164,7 +1164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="setting">
</span><span class="cx" style="display: block; padding: 0 10px"> <span><?php _e( 'Poster Image' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" disabled="disabled" data-setting="poster" value="{{ data.model.poster }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting"><?php _e( 'Remove' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="setting preload">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,7 +1196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content += track.outerHTML; #>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="content-track" type="text" value="{{ track.outerHTML }}" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="remove-setting remove-track"><?php _e( 'Remove' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove', 'media' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } ); #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span></span></pre>
</div>
</div>
</body>
</html>