<!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>[24698] trunk/wp-admin: Revisions: RTL tooltip fixes.</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/24698">24698</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-13 02:49:53 +0000 (Sat, 13 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: RTL tooltip fixes. Plus a fix for switching to compare-two mode while looking at the first revision.
Also, a meta box avatar RTL alignment fix. props DrewAPicture.
Fixes <a href="http://core.trac.wordpress.org/ticket/24739">#24739</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadminrtlcss">trunk/wp-admin/css/wp-admin-rtl.css</a></li>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.css (24697 => 24698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.css 2013-07-13 00:58:52 UTC (rev 24697)
+++ trunk/wp-admin/css/wp-admin-rtl.css 2013-07-13 02:49:53 UTC (rev 24698)
</span><span class="lines">@@ -1021,18 +1021,30 @@
</span><span class="cx">
</span><span class="cx"> .revisions img {
</span><span class="cx"> float: right;
</span><del>- margin-right: 0;
- margin-left: 5px;
</del><ins>+ margin: 5px 0 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .revisions-tooltip {
</span><del>- margin-left: -185px;
</del><ins>+ margin-right: -73px;
+ margin-left: 0;
+ -webkit-transition: right 15ms;
+ -moz-transition: right 15ms;
+ -ms-transition: right 15ms;
+ -o-transition: right 15ms;
+ transition: right 15ms;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .revisions-tooltip-arrow {
</span><del>- margin-left: 150px;
</del><ins>+ right: 0;
+ margin-left: 0;
+ margin-right: 35px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.revisions-tooltip-image {
+ float: right;
+ margin: 2px 0 0 5px;
+}
+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><span class="cx"> 11.3 - Featured Images
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (24697 => 24698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-07-13 00:58:52 UTC (rev 24697)
+++ trunk/wp-admin/js/revisions.js 2013-07-13 02:49:53 UTC (rev 24698)
</span><span class="lines">@@ -331,6 +331,7 @@
</span><span class="cx"> // Set up internal listeners
</span><span class="cx"> this.listenTo( this, 'change:from', this.changeRevisionHandler );
</span><span class="cx"> this.listenTo( this, 'change:to', this.changeRevisionHandler );
</span><ins>+ this.listenTo( this, 'change:compareTwoMode', this.changeMode );
</ins><span class="cx"> this.listenTo( this, 'update:revisions', this.updatedRevisions );
</span><span class="cx"> this.listenTo( this.diffs, 'ensure:load', this.updateLoadingStatus );
</span><span class="cx"> this.listenTo( this, 'update:diff', this.updateLoadingStatus );
</span><span class="lines">@@ -353,6 +354,16 @@
</span><span class="cx"> this.set( 'loading', ! this.diff() );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ changeMode: function( model, value ) {
+ // If we were on the first revision before switching, we have to bump them over one
+ if ( value && 0 === this.revisions.indexOf( this.get('to') ) ) {
+ this.set({
+ from: this.revisions.at(0),
+ to: this.revisions.at(1)
+ });
+ }
+ },
+
</ins><span class="cx"> updatedRevisions: function( from, to ) {
</span><span class="cx"> if ( this.get( 'compareTwoMode' ) ) {
</span><span class="cx"> // TODO: compare-two loading strategy
</span><span class="lines">@@ -620,7 +631,7 @@
</span><span class="cx"> // 0.7 to convert the slider-relative percentage to a page-relative percentage
</span><span class="cx"> // 100 to convert to a percentage
</span><span class="cx"> offset = 15 + (0.7 * offset * 100 ); // Now in a percentage
</span><del>- this.$el.css( 'left', offset + '%' );
</del><ins>+ this.$el.css( isRtl ? 'right' : 'left', offset + '%' );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -835,7 +846,10 @@
</span><span class="cx"> to: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[0] - 1 : ui.values[1] ),
</span><span class="cx"> from: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[1] - 1 : ui.values[0] )
</span><span class="cx"> };
</span><del>- movedRevision = ! isRtl && ui.value === ui.values[0] ? attributes.from : attributes.to;
</del><ins>+ if ( isRtl )
+ movedRevision = ui.value === ui.values[1] ? attributes.from : attributes.to;
+ else
+ movedRevision = ui.value === ui.values[0] ? attributes.from : attributes.to;
</ins><span class="cx"> } else {
</span><span class="cx"> sliderPosition = this.getSliderPosition( ui );
</span><span class="cx"> attributes = {
</span></span></pre>
</div>
</div>
</body>
</html>