Changeset 24698

Timestamp:

07/13/2013 02:49:53 AM (11 years ago)

Author:

markjaquith

Message:

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 #24739.

Location:

trunk/wp-admin

Files:

• css/wp-admin-rtl.css (modified) (1 diff)
• js/revisions.js (modified) (4 diffs)

trunk/wp-admin/css/wp-admin-rtl.css

@@ -1022 +1022 @@
 .revisions img {
     float: right;
-    margin-right: 0;
-    margin-left: 5px;
+    margin: 5px 0 0 5px;
 }
 
 .revisions-tooltip {
-    margin-left: -185px;
+    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;
 }
 
 .revisions-tooltip-arrow {
-    margin-left: 150px;
+    right: 0;
+    margin-left: 0;
+    margin-right: 35px;
+}
+
+.revisions-tooltip-image {
+    float: right;
+    margin: 2px 0 0 5px;
 }
 

trunk/wp-admin/js/revisions.js

@@ -332 +332 @@
             this.listenTo( this, 'change:from', this.changeRevisionHandler );
             this.listenTo( this, 'change:to', this.changeRevisionHandler );
+            this.listenTo( this, 'change:compareTwoMode', this.changeMode );
             this.listenTo( this, 'update:revisions', this.updatedRevisions );
             this.listenTo( this.diffs, 'ensure:load', this.updateLoadingStatus );
@@ -352 +353 @@
         updateLoadingStatus: function() {
             this.set( 'loading', ! this.diff() );
+        },
+
+        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)
+                });
+            }
         },
 
@@ -621 +632 @@
             // 100 to convert to a percentage
             offset = 15 + (0.7 * offset * 100 ); // Now in a percentage
-            this.$el.css( 'left', offset + '%' );
+            this.$el.css( isRtl ? 'right' : 'left', offset + '%' );
         }
     });
@@ -836 +847 @@
                     from: this.model.revisions.at( isRtl ? this.model.revisions.length - ui.values[1] - 1 : ui.values[0] )
                 };
-                movedRevision = ! isRtl && ui.value === ui.values[0] ? attributes.from : attributes.to;
+                if ( isRtl )
+                    movedRevision = ui.value === ui.values[1] ? attributes.from : attributes.to;
+                else
+                    movedRevision = ui.value === ui.values[0] ? attributes.from : attributes.to;
             } else {
                 sliderPosition = this.getSliderPosition( ui );