Ticket #23935: 23935.screen-options.patch

wp-admin/js/revisions.js

@@ -252 +252 @@
 
                         this.reloadToLoadRevisions( this.revisions );
 
+                        this.screenOptions = new revisions.view.ScreenOptions();
+
                         this.revisionsInteractions = new revisions.view.Interact({
                                 model: this.revisions
                         });
@@ -573 +575 @@
                 }
         });
 
+        revisions.view.ScreenOptions = Backbone.View.extend({
+                el: $( '#screen-options-wrap' ),
+
+                events: {
+                        'click #compare-two-revisions': 'compareTwo'
+                },
+
+                // turn on/off the compare two mode
+                compareTwo: function() {
+                        console.log( 'jo' );
+                        if ( $( '#compare-two-revisions' ).is( ':checked' ) ) { // compare 2 mode
+                                Diff.singleRevision = false ;
+
+                                if ( 1 === Diff.rightDiff )
+                                        Diff.rightDiff = 2;
+
+                                Diff.revisionView.draggingLeft = false;
+
+                                revisions.model.settings.revision_id = ''; // reset passed revision id so switching back to one handle mode doesn't re-select revision
+                                Diff.reloadLeftRight();
+                                Diff.revisionView.model = Diff.rightHandleRevisions;
+
+                        } else { // compare one mode
+                                Diff.singleRevision = true;
+                                Diff.revisionView.draggingLeft = false;
+                                Diff.reloadModelSingle();
+                        }
+                        Diff.revisionsInteractions.render();
+                        Diff.tickmarkView.render();
+                }
+        });
+
+
         /**
          * wp.revisions.view.Diff
          *
@@ -583 +618 @@
                 template: wp.template( 'revisions-diff' ),
                 draggingLeft: false,
 
-                // the compare two button is in this view, add the interaction here
                 events: {
-                        'click #compare-two-revisions': 'compareTwo',
-                        'click #restore-revision':      'restore'
+                        'click #restore-revision': 'restore'
                 },
 
                 // render the revisions
@@ -646 +679 @@
                         $( '#compare-two-revisions' ).prop( 'checked', ! Diff.singleRevision );
                 },
 
-                // turn on/off the compare two mode
-                compareTwo: function() {
-                        if ( $( '#compare-two-revisions' ).is( ':checked' ) ) { // compare 2 mode
-                                Diff.singleRevision = false ;
-
-                                if ( 1 === Diff.rightDiff )
-                                        Diff.rightDiff = 2;
-
-                                Diff.revisionView.draggingLeft = false;
-
-                                revisions.model.settings.revision_id = ''; // reset passed revision id so switching back to one handle mode doesn't re-select revision
-                                Diff.reloadLeftRight();
-                                Diff.revisionView.model = Diff.rightHandleRevisions;
-
-                        } else { // compare one mode
-                                Diff.singleRevision = true;
-                                Diff.revisionView.draggingLeft = false;
-                                Diff.reloadModelSingle();
-                        }
-                        Diff.revisionsInteractions.render();
-                        Diff.tickmarkView.render();
-                },
-
                 restore: function() {
                         document.location = $( '#restore-revision' ).data( 'restoreLink' );
                 }

wp-admin/css/wp-admin.css

@@ -3561 +3561 @@
         text-decoration: none;
 }
 
-#revision-diff-container {
-        position: relative;
-}
-
-#toggle-revision-compare-mode {
-        position: absolute;
-        top: 0;
-        right: 0;
-        padding-top: 15px;
-}
-
 #loading-status {
         position: absolute;
         top: 0;

wp-admin/revision.php

@@ -92 +92 @@
 $strings['settings'] = $settings;
 wp_localize_script( 'revisions', 'wpRevisionsL10n', $strings );
 
+function _show_compare_mode( $screen_settings, $screen ) {
+        if ( 'revision' != $screen->id )
+                return;
+
+        $setting = '<label>';
+        $setting .= '<input type="checkbox" id="compare-two-revisions" />';
+        $setting .= esc_attr__( 'Compare two revisions' );
+        $setting .= '</label>';
+
+        return $setting;
+}
+add_filter( 'screen_settings', '_show_compare_mode', 10, 2 );
+
 require_once( './admin-header.php' );
-
 ?>
 
 <div class="wrap">
@@ -116 +128 @@
 </div>
 
 <script id="tmpl-revisions-diff" type="text/html">
-        <div id="toggle-revision-compare-mode">
-                <label>
-                        <input type="checkbox" id="compare-two-revisions" />
-                        <?php esc_attr_e( 'Compare two revisions' ); ?>
-                </label>
-        </div>
-
         <div id="diff-header-from" class="diff-header">
                 <div id="diff-title-from-current-version" class="diff-title">
                         <?php printf( '<strong>%1$s</strong> %2$s.' , __( 'From:' ), __( 'the current version' ) ); ?>