// Render and append
this.view.render();
this.$el.empty().append( this.view.el ).addClass( 'rendered' );
- this.$el.append( '<br class="clear"/>' );
},
// Defines search element container
$( '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
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 );
// 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 ) {
this.count = this.length;
}
- this.trigger( 'update' );
+ this.trigger( 'themes:update' );
this.trigger( 'query:success', this.count );
}
},
'keydown': themes.isInstall ? 'preview': 'expand',
'touchend': themes.isInstall ? 'preview': 'expand',
'keyup': 'addFocus',
- 'touchmove': 'preventExpand'
+ 'touchmove': 'preventExpand',
+ 'click .theme-install': 'installTheme',
+ 'click .update-message': 'updateTheme'
},
touchDrag: false,
+ initialize: function() {
+ this.model.on( 'change', this.render, this );
+ },
+
render: function() {
var data = this.model.toJSON();
+
// Render themes using the html template
this.$el.html( this.html( data ) ).attr({
tabindex: 0,
- 'aria-describedby' : data.id + '-action ' + data.id + '-name'
+ 'aria-describedby' : data.id + '-action ' + data.id + '-name',
+ 'data-slug': data.id
});
// Renders active theme styles
if ( this.model.get( 'displayAuthor' ) ) {
this.$el.addClass( 'display-author' );
}
-
- if ( this.model.get( 'installed' ) ) {
- this.$el.addClass( 'is-installed' );
- }
},
// Adds a class to the currently active theme
return;
}
+ // Prevent the modal from showing when the user clicks one of the direct action buttons.
+ if ( $( event.target ).is( '.theme-actions a, .update-message, .button-link, .notice-dismiss' ) ) {
+ return;
+ }
+
// Set focused theme to current element
themes.focusedTheme = this.$el;
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;
}
// Allow direct link path to installing a theme.
- if ( $( event.target ).hasClass( 'button-primary' ) ) {
+ if ( $( event.target ).not( '.install-theme-preview' ).parents( '.theme-actions' ).length ) {
return;
}
if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {
$themeInstaller.find( '.next-theme' ).addClass( 'disabled' );
}
+ },
+
+ installTheme: function( event ) {
+ var _this = this;
+
+ event.preventDefault();
+
+ wp.updates.maybeRequestFilesystemCredentials( event );
+
+ $( document ).on( 'wp-theme-install-success', function( event, response ) {
+ if ( _this.model.get( 'id' ) === response.slug ) {
+ _this.model.set( { 'installed': true } );
+ }
+ } );
+
+ wp.updates.installTheme( {
+ slug: $( event.target ).data( 'slug' )
+ } );
+ },
+
+ updateTheme: function( event ) {
+ var _this = this;
+ event.preventDefault();
+
+ wp.updates.maybeRequestFilesystemCredentials( event );
+
+ $( document ).on( 'wp-theme-update-success', function( event, response ) {
+ _this.model.off( 'change', _this.render, _this );
+ if ( _this.model.get( 'id' ) === response.slug ) {
+ _this.model.set( {
+ hasUpdate: false,
+ version: response.newVersion
+ } );
+ }
+ _this.model.on( 'change', _this.render, _this );
+ } );
+
+ wp.updates.updateTheme( {
+ slug: $( event.target ).parents( 'div.theme' ).first().data( 'slug' )
+ } );
}
});
'click': 'collapse',
'click .delete-theme': 'deleteTheme',
'click .left': 'previousTheme',
- 'click .right': 'nextTheme'
+ 'click .right': 'nextTheme',
+ 'click #update-theme': 'updateTheme'
},
// The HTML template for the theme overlay
this.$el.toggleClass( 'active', this.model.get( 'active' ) );
},
- // Keeps :focus within the theme details elements
+ // Set initial focus and constrain tabbing within the theme browser modal.
containFocus: function( $el ) {
- var $target;
- // Move focus to the primary action
+ // Set initial focus on the primary action control.
_.delay( function() {
$( '.theme-wrap a.button-primary:visible' ).focus();
- }, 500 );
+ }, 100 );
+ // Constrain tabbing within the modal.
$el.on( 'keydown.wp-themes', function( event ) {
+ var $firstFocusable = $el.find( '.theme-header button:not(.disabled)' ).first(),
+ $lastFocusable = $el.find( '.theme-actions a:visible' ).last();
- // Tab key
- if ( event.which === 9 ) {
- $target = $( event.target );
-
- // Keep focus within the overlay by making the last link on theme actions
- // switch focus to button.left on tabbing and vice versa
- if ( $target.is( 'button.left' ) && event.shiftKey ) {
- $el.find( '.theme-actions a:last-child' ).focus();
+ // Check for the Tab key.
+ if ( 9 === event.which ) {
+ if ( $firstFocusable[0] === event.target && event.shiftKey ) {
+ $lastFocusable.focus();
event.preventDefault();
- } else if ( $target.is( '.theme-actions a:last-child' ) ) {
- $el.find( 'button.left' ).focus();
+ } else if ( $lastFocusable[0] === event.target && ! event.shiftKey ) {
+ $firstFocusable.focus();
event.preventDefault();
}
}
// Disable Left/Right when at the start or end of the collection
if ( this.model.cid === this.model.collection.at(0).cid ) {
- this.$el.find( '.left' ).addClass( 'disabled' );
+ this.$el.find( '.left' )
+ .addClass( 'disabled' )
+ .prop( 'disabled', true );
}
if ( this.model.cid === this.model.collection.at( this.model.collection.length - 1 ).cid ) {
- this.$el.find( '.right' ).addClass( 'disabled' );
+ this.$el.find( '.right' )
+ .addClass( 'disabled' )
+ .prop( 'disabled', true );
}
},
this.trigger( 'theme:collapse' );
},
- // Confirmation dialog for deleting a theme
- deleteTheme: function() {
- return confirm( themes.data.settings.confirmDelete );
+ updateTheme: function( event ) {
+ var _this = this;
+ event.preventDefault();
+
+ wp.updates.maybeRequestFilesystemCredentials( event );
+
+ $( document ).on( 'wp-theme-update-success', function( event, response ) {
+ if ( _this.model.get( 'id' ) === response.slug ) {
+ _this.model.set( {
+ hasUpdate: false,
+ version: response.newVersion
+ } );
+ }
+ _this.render();
+ } );
+
+ wp.updates.updateTheme( {
+ slug: $( event.target ).data( 'slug' )
+ } );
+ },
+
+ deleteTheme: function( event ) {
+ var _this = this,
+ _collection = _this.model.collection,
+ _themes = themes;
+ event.preventDefault();
+
+ // Confirmation dialog for deleting a theme.
+ if ( ! window.confirm( wp.themes.data.settings.confirmDelete ) ) {
+ return;
+ }
+
+ wp.updates.maybeRequestFilesystemCredentials( event );
+
+ $( document ).one( 'wp-theme-delete-success', function( event, response ) {
+ _this.$el.find( '.close' ).trigger( 'click' );
+ $( '[data-slug="' + response.slug + '"' ).css( { backgroundColor:'#faafaa' } ).fadeOut( 350, function() {
+ $( this ).remove();
+ _themes.data.themes = _.without( _themes.data.themes, _.findWhere( _themes.data.themes, { id: response.slug } ) );
+
+ $( '.wp-filter-search' ).val( '' );
+ _collection.doSearch( '' );
+ _collection.remove( _this.model );
+ _collection.trigger( 'themes:update' );
+ } );
+ } );
+
+ wp.updates.deleteTheme( {
+ slug: this.model.get( 'id' )
+ } );
},
nextTheme: function() {
events: {
'click .close-full-overlay': 'close',
'click .collapse-sidebar': 'collapse',
+ 'click .devices button': 'previewDevice',
'click .previous-theme': 'previousTheme',
'click .next-theme': 'nextTheme',
- 'keyup': 'keyEvent'
+ 'keyup': 'keyEvent',
+ 'click .theme-install': 'installTheme'
},
// The HTML template for the theme preview
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 } );
$( '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() {
if ( themes.focusedTheme ) {
themes.focusedTheme.focus();
}
- });
+ }).removeClass( 'iframe-ready' );
themes.router.navigate( themes.router.baseUrl( '' ) );
this.trigger( 'preview:close' );
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 ) {
if ( event.keyCode === 37 ) {
this.previousTheme();
}
+ },
+
+ installTheme: function( event ) {
+ var _this = this,
+ $target = $( event.target );
+ event.preventDefault();
+
+ if ( $target.hasClass( 'disabled' ) ) {
+ return;
+ }
+
+ wp.updates.maybeRequestFilesystemCredentials( event );
+
+ $( document ).on( 'wp-theme-install-success', function() {
+ _this.model.set( { 'installed': true } );
+ } );
+
+ wp.updates.installTheme( {
+ slug: $target.data( 'slug' )
+ } );
}
});
// 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
index: 0,
// The theme count element
- count: $( '.wp-core-ui .theme-count' ),
+ count: $( '.wrap .theme-count' ),
// The live themes count
liveThemeCount: 0,
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 ) {
return;
}
+ // Bail if the filesystem credentials dialog is shown.
+ if ( $( '#request-filesystem-credentials-dialog' ).is( ':visible' ) ) {
+ return;
+ }
+
// Pressing the right arrow key fires a theme:next event
if ( event.keyCode === 39 ) {
self.overlay.nextTheme();
this.liveThemeCount = this.collection.count ? this.collection.count : this.collection.length;
this.count.text( this.liveThemeCount );
- this.announceSearchResults( this.liveThemeCount );
+ /*
+ * In the theme installer the themes count is already announced
+ * because `announceSearchResults` is called on `query:success`.
+ */
+ if ( ! themes.isInstall ) {
+ this.announceSearchResults( this.liveThemeCount );
+ }
},
// Iterates through each instance of the collection
}
// Make sure the add-new stays at the end
- if ( page >= 1 ) {
+ if ( ! themes.isInstall && page >= 1 ) {
$( '.add-new-theme' ).remove();
}
});
// 'Add new theme' element shown at the end of the grid
- if ( themes.data.settings.canInstall ) {
- this.$el.append( '<div class="theme add-new-theme"><a href="' + themes.data.settings.installURI + '"><div class="theme-screenshot"><span></span></div><h3 class="theme-name">' + l10n.addNew + '</h3></a></div>' );
+ if ( ! themes.isInstall && themes.data.settings.canInstall ) {
+ this.$el.append( '<div class="theme add-new-theme"><a href="' + themes.data.settings.installURI + '"><div class="theme-screenshot"><span></span></div><h2 class="theme-name">' + l10n.addNew + '</h2></a></div>' );
}
this.parent.page++;
// Renders the overlay with the ThemeDetails view
// Uses the current model data
expand: function( id ) {
- var self = this;
+ var self = this, $card, $modal;
// Set the current theme model
this.model = self.collection.get( id );
});
this.overlay.render();
+
+ if ( this.model.get( 'hasUpdate' ) ) {
+ $card = $( '[data-slug="' + this.model.id + '"]' );
+ $modal = $( this.overlay.el );
+
+ if ( $card.find( '.updating-message' ).length ) {
+ $modal.find( '.notice-warning h3' ).remove();
+ $modal.find( '.notice-warning' )
+ .removeClass( 'notice-large' )
+ .addClass( 'updating-message' )
+ .find( 'p' ).text( wp.updates.l10n.updating );
+ } else if ( $card.find( '.notice-error' ).length ) {
+ $modal.find( '.notice-warning' ).remove();
+ }
+ }
+
this.$overlay.html( this.overlay.el );
// Bind to theme:next and theme:previous
'keyup': 'search'
},
+ terms: '',
+
// Handles Ajax request for searching through themes in public repo
search: function( event ) {
doSearch: _.debounce( function( value ) {
var request = {};
+ // Don't do anything if the search terms haven't changed.
+ if ( this.terms === value ) {
+ return;
+ }
+
+ // Updates terms with the value passed.
+ this.terms = value;
+
request.search = value;
// Intercept an [author] search.
}
$( '.filter-links li > a.current' ).removeClass( 'current' );
- $( 'body' ).removeClass( 'show-filters filters-applied' );
+ $( 'body' ).removeClass( 'show-filters filters-applied show-favorites-form' );
// Get the themes by sending Ajax POST request to api.wordpress.org/themes
// or searching the local cache
'click .filter-drawer .apply-filters': 'applyFilters',
'click .filter-group [type="checkbox"]': 'addFilter',
'click .filter-drawer .clear-filters': 'clearFilters',
- 'click .filtered-by': 'backToFilters'
+ 'click .filtered-by': 'backToFilters',
+ 'click .favorites-form-submit' : 'saveUsername',
+ 'keyup #wporg-username-input': 'saveUsername'
},
// Initial render method
$( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
$( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
+ if ( 'favorites' === sort ) {
+ $ ( 'body' ).addClass( 'show-favorites-form' );
+ } else {
+ $ ( 'body' ).removeClass( 'show-favorites-form' );
+ }
+
this.browse( sort );
},
// Construct the filter request
// using the default values
- filter = _.union( filter, this.filtersChecked() );
+ filter = _.union( [ filter, this.filtersChecked() ] );
request = { tag: [ filter ] };
// Get the themes by sending Ajax POST request to api.wordpress.org/themes
this.collection.query( request );
},
+ // Save the user's WordPress.org username and get his favorite themes.
+ saveUsername: function ( event ) {
+ var username = $( '#wporg-username-input' ).val(),
+ nonce = $( '#wporg-username-nonce' ).val(),
+ request = { browse: 'favorites', user: username },
+ that = this;
+
+ if ( event ) {
+ event.preventDefault();
+ }
+
+ // save username on enter
+ if ( event.type === 'keyup' && event.which !== 13 ) {
+ return;
+ }
+
+ return wp.ajax.send( 'save-wporg-username', {
+ data: {
+ _wpnonce: nonce,
+ username: username
+ },
+ success: function () {
+ // Get the themes by sending Ajax POST request to api.wordpress.org/themes
+ // or searching the local cache
+ that.collection.query( request );
+ }
+ } );
+ },
+
// Get the checked filters
// @return {array} of tags or false
filtersChecked: function() {
// in new location
searchContainer: $( '.wp-filter .search-form' ),
+ /*
+ * When users press the "Upload Theme" button, show the upload form in place.
+ */
uploader: function() {
- $( 'a.upload' ).on( 'click', function( event ) {
- event.preventDefault();
- $( 'body' ).addClass( 'show-upload-theme' );
- themes.router.navigate( themes.router.baseUrl( '?upload' ), { replace: true } );
- });
- $( 'a.browse-themes' ).on( 'click', function( event ) {
- event.preventDefault();
- $( 'body' ).removeClass( 'show-upload-theme' );
- themes.router.navigate( themes.router.baseUrl( '' ), { replace: true } );
+ var uploadViewToggle = $( '.upload-view-toggle' ),
+ $body = $( document.body );
+
+ uploadViewToggle.on( 'click', function() {
+ // Toggle the upload view.
+ $body.toggleClass( 'show-upload-view' );
+ // Toggle the `aria-expanded` button attribute.
+ uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
});
},
routes: {
'theme-install.php?theme=:slug': 'preview',
'theme-install.php?browse=:sort': 'sort',
- 'theme-install.php?upload': 'upload',
'theme-install.php?search=:query': 'search',
'theme-install.php': 'sort'
},
themes.router.on( 'route:preview', function( slug ) {
request.theme = slug;
self.view.collection.query( request );
+ self.view.collection.once( 'update', function() {
+ self.view.view.theme.preview();
+ });
});
// Handles sorting / browsing routes
self.view.trigger( 'theme:close' );
});
- // Support the `upload` route by going straight to upload section
- themes.router.on( 'route:upload', function() {
- $( 'a.upload' ).trigger( 'click' );
- });
-
// The `search` route event. The router populates the input field.
themes.router.on( 'route:search', function() {
$( '.wp-filter-search' ).focus().trigger( 'keyup' );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff