Changeset 24638

Timestamp:

07/10/2013 06:08:56 AM (11 years ago)

Author:

markjaquith

Message:

Revisions: simpler hash URLs. Misc refactoring.

• Single mode: #at/:to
• Compare two mode: #from/:from/to/:to
• Make use of _.isUndefined()

See #24425.

File:

• trunk/wp-admin/js/revisions.js (modified) (5 diffs)

trunk/wp-admin/js/revisions.js

@@ -7 +7 @@
 
     // Link settings.
-    revisions.settings = typeof _wpRevisionsSettings === 'undefined' ? {} : _wpRevisionsSettings;
+    revisions.settings = _.isUndefined( _wpRevisionsSettings ) ? {} : _wpRevisionsSettings;
 
     // For debugging
@@ -719 +719 @@
                 // In single handle mode, the 1st stored revision is 'blank' and the 'from' model is not set
                 // In this case we move the to index over one
-                if ( 'undefined' == typeof this.model.get('from') ) {
+                if ( _.isUndefined( this.model.get('from') ) ) {
                     if ( isRtl ) {
                         leftValue  = this.model.revisions.length -  this.model.revisions.indexOf( this.model.get('to') ) - 2;
@@ -837 +837 @@
             var attributes;
             // Compare two revisions mode
-            if ( 'undefined' !== typeof ui.values && this.model.get('compareTwoMode') ) {
+            if ( ! _.isUndefined( ui.values ) && this.model.get('compareTwoMode') ) {
                 // Prevent sliders from occupying same spot
                 if ( ui.values[1] === ui.values[0] )
@@ -894 +894 @@
 
         routes: {
-            'revision/from/:from/to/:to/handles/:handles': 'gotoRevisionId'
+            'from/:from/to/:to': 'handleRoute',
+            'at/:to': 'routeSingle'
         },
 
@@ -900 +901 @@
             var from = this.model.has('from') ? this.model.get('from').id : 0;
             var to = this.model.get('to').id;
-            var handles = this.model.get('compareTwoMode') ? '2' : '1';
-
-            this.navigate( '/revision/from/' + from + '/to/' + to + '/handles/' + handles );
-        },
-
-        gotoRevisionId: function( from, to, handles ) {
-            from = parseInt( from, 10 );
-            to = parseInt( to, 10 );
-
-            this.model.set({ compareTwoMode: ( '2' === handles ) });
-
-            if ( 'undefined' !== typeof this.model ) {
+            if ( this.model.get('compareTwoMode' ) )
+                this.navigate( 'from/' + from + '/to/' + to );
+            else
+                this.navigate( 'at/' + to );
+        },
+
+        handleRoute: function( a, b ) {
+            var from, to, compareTwo;
+
+            // If `b` is undefined, this was a 'revision/:to' route
+            if ( _.isUndefined( b ) ) {
+                b = a;
+                a = 0;
+                compareTwo = true;
+            } else {
+                compareTwo = false;
+            }
+
+            from = parseInt( a, 10 );
+            to = parseInt( b, 10 );
+
+            this.model.set({ compareTwoMode: compareTwo });
+
+            if ( ! _.isUndefined( this.model ) ) {
                 var selectedToRevision = this.model.revisions.findWhere({ id: to }),
                     selectedFromRevision = this.model.revisions.findWhere({ id: from });