<!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>[29086] trunk/src: Media Grid: </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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29086">29086</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-11 05:33:29 +0000 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid:
* Move the grid down via CSS transition when the Screen Options slide open.
* Remove some unused CSS for grid options.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (29085 => 29086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2014-07-11 05:21:04 UTC (rev 29085)
+++ trunk/src/wp-admin/js/common.js 2014-07-11 05:33:29 UTC (rev 29086)
</span><span class="lines">@@ -150,6 +150,8 @@
</span><span class="cx"> panel.focus();
</span><span class="cx"> link.addClass('screen-meta-active').attr('aria-expanded', true);
</span><span class="cx"> });
</span><ins>+
+ $( document ).trigger( 'screen:options:open' );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> close: function( panel, link ) {
</span><span class="lines">@@ -158,6 +160,8 @@
</span><span class="cx"> $('.screen-meta-toggle').css('visibility', '');
</span><span class="cx"> panel.parent().hide();
</span><span class="cx"> });
</span><ins>+
+ $( document ).trigger( 'screen:options:close' );
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29085 => 29086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-11 05:21:04 UTC (rev 29085)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-11 05:33:29 UTC (rev 29086)
</span><span class="lines">@@ -2580,22 +2580,13 @@
</span><span class="cx"> line-height: 29px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-grid-view .view-switch,
-.media-grid-field-options {
</del><ins>+.media-grid-view .view-switch {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> float: none;
</span><span class="cx"> margin-top: 13px;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-grid-field-options span {
- padding-right: 5px;
-}
-
-.media-grid-field-options label {
- margin-right: 10px;
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Position both the frame and the uploader window into the content
</span><span class="cx"> * area of the screen.
</span><span class="lines">@@ -2607,7 +2598,14 @@
</span><span class="cx"> left: 160px;
</span><span class="cx"> right: 0;
</span><span class="cx"> top: 32px;
</span><ins>+ -webkit-transition: 200ms ease-in-out;
+ transition: 200ms ease-in-out;
</ins><span class="cx"> }
</span><ins>+
+.media-grid-view-options {
+ top: 120px;
+}
+
</ins><span class="cx"> @media screen and (max-width: 900px) {
</span><span class="cx"> .auto-fold .media-grid-view {
</span><span class="cx"> left: 36px;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29085 => 29086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-07-11 05:21:04 UTC (rev 29085)
+++ trunk/src/wp-includes/js/media-grid.js 2014-07-11 05:33:29 UTC (rev 29086)
</span><span class="lines">@@ -102,6 +102,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $(document).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) );
</span><ins>+ $(document).on( 'screen:options:open', _.bind( this.screenOptionsOpen, this ) );
+ $(document).on( 'screen:options:close', _.bind( this.screenOptionsClose, this ) );
+
</ins><span class="cx"> // Ensure core and media grid view UI is enabled.
</span><span class="cx"> this.$el.addClass('wp-core-ui media-grid-view');
</span><span class="cx">
</span><span class="lines">@@ -152,6 +155,14 @@
</span><span class="cx"> _.delay( _.bind( this.createRouter, this ), 1000 );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ screenOptionsOpen: function() {
+ this.$el.addClass( 'media-grid-view-options' );
+ },
+
+ screenOptionsClose: function() {
+ this.$el.removeClass( 'media-grid-view-options' );
+ },
+
</ins><span class="cx"> createRouter: function() {
</span><span class="cx"> this.gridRouter = new media.view.MediaFrame.Manage.Router();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>