Changeset 1453

Timestamp:

03/26/2015 12:43:29 AM (11 years ago)

Author:

obenland

Message:

WP.org Themes: Don't create a /preview/ URL for previews.

The default has always been wp-themes.com. Let's keep it that way and handle
the integrated preview in JS only.

Also provides a better fix for #901. If themes are advanced in preview, the
modal keeps up with that now.

Fixes #895.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes

Files:

• js/theme.js (modified) (7 diffs)
• view-templates/theme-preview.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js

@@ -512 +512 @@
                         this.setNavButtonsState();
 
-                        // Hide previous/next navigation if there is only one theme
-                        if ( this.model.collection.length === 1 ) {
-                                preview.$el.addClass( 'no-navigation' );
-                        } else {
-                                preview.$el.removeClass( 'no-navigation' );
-                        }
-
                         if ( themes.data.settings.isMobile ) {
                                 preview.$el.addClass( 'wp-full-overlay collapsed' );
@@ -531 +524 @@
                         // for `theme:next` and `theme:previous` events.
                         this.listenTo( preview, 'theme:next', function() {
+                                this.trigger( 'theme:next' );
+
                                 // Keep local track of current theme model.
                                 current = self.model;
@@ -556 +551 @@
                         })
                         .listenTo( preview, 'theme:previous', function() {
+                                this.trigger( 'theme:previous' );
+
                                 // Keep track of current theme model.
                                 current = self.model;
@@ -813 +810 @@
                         this.$el.html( this.html( data ) );
 
-                        themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) + '/preview' ) );
+                        themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ) );
 
                         this.$el.fadeIn( 200, function() {
@@ -1073 +1070 @@
                         // Sanity check which also serves as a boundary test
                         if ( nextModel !== undefined ) {
-
-                                // We have a new theme...
-                                // Close the overlay
-                                this.overlay.closeOverlay();
-
                                 // Trigger a route update for the current model
                                 self.theme.trigger( 'theme:expand', nextModel.cid );
-
                         }
                 },
@@ -1097 +1088 @@
 
                         if ( previousModel !== undefined ) {
-
-                                // We have a new theme...
-                                // Close the overlay
-                                this.overlay.closeOverlay();
-
                                 // Trigger a route update for the current model
                                 self.theme.trigger( 'theme:expand', previousModel.cid );
-
                         }
                 }
@@ -1461 +1446 @@
                         'search/:query/' : 'search',
                         'author/:author/': 'author',
-                        ':slug/preview/' : 'preview',
                         ':slug/'         : 'preview',
                         ''               : 'sort'

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/view-templates/theme-preview.php

@@ -12 +12 @@
                                 <span class="theme-by"><?php printf( __( 'By %s' ), '{{ data.author.display_name }}' ); ?></span>
 
-                                <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
+                                <img class="theme-screenshot" src="{{ data.screenshot_url }}?w=520&strip=all" alt="" />
 
                                 <div class="theme-details">