Changeset 1256

Timestamp:

02/13/2015 12:17:58 AM (12 years ago)

Author:

obenland

Message:

WP.org Themes: Make sure URLs are passed correctly.

Fixes a big where URLs where not created correctly, leading to invalid
locations if if used outside the current context (like in a new tab).

See #745.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js (modified) (4 diffs)

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

@@ -74 +74 @@
                         });
 
-                        wp.themes.router.navigate( wp.themes.router.baseUrl( 'tag/' + tags.join( '+' ) ), { replace: true } );
+                        wp.themes.router.navigate( wp.themes.router.baseUrl( 'tag/' + tags.join( '+' ) ) );
 
                         // Get the themes by sending Ajax POST request to api.wordpress.org/themes
@@ -139 +139 @@
                         var data = this.model.toJSON();
 
-                        data.permalink = wp.themes.router.baseUrl( data.slug );
+                        data.permalink = wp.themes.data.settings.adminUrl + wp.themes.router.baseUrl( data.slug );
 
                         // Render themes using the html template
@@ -201 +201 @@
                         // Make tags click-able and separated by a comma.
                         data.tags = _.map( data.tags, function( tag ) {
-                                return '<a href="' + wp.themes.router.baseUrl( 'tag/' + tag ) + '">' + tag + '</a>';
+                                return '<a href="' + wp.themes.data.settings.adminUrl + wp.themes.router.baseUrl( 'tag/' + tag ) + '">' + tag + '</a>';
                         }).join( ', ' );
 
@@ -527 +527 @@
                                 url += '/';
                         }
-                        return '/' + url;
+                        return url;
                 },