X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8ab4a4532479e8db471032b51042ec8c4716d091..b925718b4bf2dd47a8429f844d0a255ca6e35bd1:/wp-admin/js/theme.js?ds=sidebyside
diff --git a/wp-admin/js/theme.js b/wp-admin/js/theme.js
index 2cf5f770..9cd738a1 100644
--- a/wp-admin/js/theme.js
+++ b/wp-admin/js/theme.js
@@ -80,11 +80,10 @@ themes.view.Appearance = wp.Backbone.View.extend({
// Render and append
this.view.render();
this.$el.empty().append( this.view.el ).addClass( 'rendered' );
- this.$el.append( '
' );
},
// Defines search element container
- searchContainer: $( '#wpbody h2:first' ),
+ searchContainer: $( '#wpbody h1:first' ),
// Search input and view
// for current theme collection
@@ -159,8 +158,8 @@ themes.Collection = Backbone.Collection.extend({
$( 'body' ).removeClass( 'no-results' );
}
- // Trigger an 'update' event
- this.trigger( 'update' );
+ // Trigger a 'themes:update' event
+ this.trigger( 'themes:update' );
},
// Performs a search within the collection
@@ -186,7 +185,7 @@ themes.Collection = Backbone.Collection.extend({
description = data.get( 'description' ).replace( /(<([^>]+)>)/ig, '' );
author = data.get( 'author' ).replace( /(<([^>]+)>)/ig, '' );
- haystack = _.union( name, data.get( 'id' ), description, author, data.get( 'tags' ) );
+ haystack = _.union( [ name, data.get( 'id' ), description, author, data.get( 'tags' ) ] );
if ( match.test( data.get( 'author' ) ) && term.length > 2 ) {
data.set( 'displayAuthor', true );
@@ -265,7 +264,7 @@ themes.Collection = Backbone.Collection.extend({
// Trigger a collection refresh event
// and a `query:success` event with a `count` argument.
- self.trigger( 'update' );
+ self.trigger( 'themes:update' );
self.trigger( 'query:success', count );
if ( data.themes && data.themes.length === 0 ) {
@@ -309,7 +308,7 @@ themes.Collection = Backbone.Collection.extend({
this.count = this.length;
}
- this.trigger( 'update' );
+ this.trigger( 'themes:update' );
this.trigger( 'query:success', this.count );
}
},
@@ -454,6 +453,8 @@ themes.view.Theme = wp.Backbone.View.extend({
var self = this,
current, preview;
+ event = event || window.event;
+
// Bail if the user scrolled on a touch device
if ( this.touchDrag === true ) {
return this.touchDrag = false;
@@ -755,6 +756,7 @@ themes.view.Preview = themes.view.Details.extend({
events: {
'click .close-full-overlay': 'close',
'click .collapse-sidebar': 'collapse',
+ 'click .devices button': 'previewDevice',
'click .previous-theme': 'previousTheme',
'click .next-theme': 'nextTheme',
'keyup': 'keyEvent'
@@ -764,9 +766,15 @@ themes.view.Preview = themes.view.Details.extend({
html: themes.template( 'theme-preview' ),
render: function() {
- var data = this.model.toJSON();
+ var self = this, currentPreviewDevice,
+ data = this.model.toJSON();
- this.$el.html( this.html( data ) );
+ this.$el.removeClass( 'iframe-ready' ).html( this.html( data ) );
+
+ currentPreviewDevice = this.$el.data( 'current-preview-device' );
+ if ( currentPreviewDevice ) {
+ self.tooglePreviewDeviceButtons( currentPreviewDevice );
+ }
themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
@@ -774,6 +782,14 @@ themes.view.Preview = themes.view.Details.extend({
$( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
$( '.close-full-overlay' ).focus();
});
+
+ this.$el.find( 'iframe' ).one( 'load', function() {
+ self.iframeLoaded();
+ });
+ },
+
+ iframeLoaded: function() {
+ this.$el.addClass( 'iframe-ready' );
},
close: function() {
@@ -784,7 +800,7 @@ themes.view.Preview = themes.view.Details.extend({
if ( themes.focusedTheme ) {
themes.focusedTheme.focus();
}
- });
+ }).removeClass( 'iframe-ready' );
themes.router.navigate( themes.router.baseUrl( '' ) );
this.trigger( 'preview:close' );
@@ -793,12 +809,41 @@ themes.view.Preview = themes.view.Details.extend({
return false;
},
- collapse: function() {
+ collapse: function( event ) {
+ var $button = $( event.currentTarget );
+ if ( 'true' === $button.attr( 'aria-expanded' ) ) {
+ $button.attr({ 'aria-expanded': 'false', 'aria-label': l10n.expandSidebar });
+ } else {
+ $button.attr({ 'aria-expanded': 'true', 'aria-label': l10n.collapseSidebar });
+ }
this.$el.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
return false;
},
+ previewDevice: function( event ) {
+ var device = $( event.currentTarget ).data( 'device' );
+
+ this.$el
+ .removeClass( 'preview-desktop preview-tablet preview-mobile' )
+ .addClass( 'preview-' + device )
+ .data( 'current-preview-device', device );
+
+ this.tooglePreviewDeviceButtons( device );
+ },
+
+ tooglePreviewDeviceButtons: function( newDevice ) {
+ var $devices = $( '.wp-full-overlay-footer .devices' );
+
+ $devices.find( 'button' )
+ .removeClass( 'active' )
+ .attr( 'aria-pressed', false );
+
+ $devices.find( 'button.preview-' + newDevice )
+ .addClass( 'active' )
+ .attr( 'aria-pressed', true );
+ },
+
keyEvent: function( event ) {
// The escape key closes the preview
if ( event.keyCode === 27 ) {
@@ -821,7 +866,7 @@ themes.view.Preview = themes.view.Details.extend({
// a wrapper that will hold all the theme elements
themes.view.Themes = wp.Backbone.View.extend({
- className: 'themes',
+ className: 'themes wp-clearfix',
$overlay: $( 'div.theme-overlay' ),
// Number to keep track of scroll position
@@ -829,7 +874,7 @@ themes.view.Themes = wp.Backbone.View.extend({
index: 0,
// The theme count element
- count: $( '.wp-core-ui .theme-count' ),
+ count: $( '.wrap .theme-count' ),
// The live themes count
liveThemeCount: 0,
@@ -847,11 +892,11 @@ themes.view.Themes = wp.Backbone.View.extend({
self.currentTheme();
// When the collection is updated by user input...
- this.listenTo( self.collection, 'update', function() {
+ this.listenTo( self.collection, 'themes:update', function() {
self.parent.page = 0;
self.currentTheme();
self.render( this );
- });
+ } );
// Update theme count to full result set when available.
this.listenTo( self.collection, 'query:success', function( count ) {
@@ -952,7 +997,7 @@ themes.view.Themes = wp.Backbone.View.extend({
}
// Make sure the add-new stays at the end
- if ( page >= 1 ) {
+ if ( ! themes.isInstall && page >= 1 ) {
$( '.add-new-theme' ).remove();
}
@@ -974,8 +1019,8 @@ themes.view.Themes = wp.Backbone.View.extend({
});
// 'Add new theme' element shown at the end of the grid
- if ( themes.data.settings.canInstall ) {
- this.$el.append( '