X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..b22765f41bf0b2021b9beb9120ee0ac91fa89292:/wp-admin/js/theme.js diff --git a/wp-admin/js/theme.js b/wp-admin/js/theme.js index 0e83f4e0..18596e82 100644 --- a/wp-admin/js/theme.js +++ b/wp-admin/js/theme.js @@ -80,7 +80,6 @@ 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 @@ -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 ); } }, @@ -376,17 +375,25 @@ themes.view.Theme = wp.Backbone.View.extend({ '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 @@ -395,10 +402,6 @@ themes.view.Theme = wp.Backbone.View.extend({ 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 @@ -440,6 +443,11 @@ themes.view.Theme = wp.Backbone.View.extend({ 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; @@ -454,13 +462,15 @@ 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; } // 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; } @@ -578,6 +588,46 @@ themes.view.Theme = wp.Backbone.View.extend({ 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' ) + } ); } }); @@ -592,7 +642,8 @@ themes.view.Details = wp.Backbone.View.extend({ '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 @@ -618,28 +669,26 @@ themes.view.Details = wp.Backbone.View.extend({ 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(); } } @@ -696,10 +745,14 @@ themes.view.Details = wp.Backbone.View.extend({ // 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 ); } }, @@ -712,9 +765,56 @@ themes.view.Details = wp.Backbone.View.extend({ 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() { @@ -755,18 +855,26 @@ 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' + '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 } ); @@ -774,6 +882,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 +900,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' ); @@ -805,6 +921,29 @@ themes.view.Preview = themes.view.Details.extend({ 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 ) { @@ -820,6 +959,26 @@ themes.view.Preview = themes.view.Details.extend({ 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' ) + } ); } }); @@ -827,7 +986,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 @@ -835,7 +994,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, @@ -853,11 +1012,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 ) { @@ -890,6 +1049,11 @@ themes.view.Themes = wp.Backbone.View.extend({ 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(); @@ -940,7 +1104,13 @@ themes.view.Themes = wp.Backbone.View.extend({ 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 @@ -958,7 +1128,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(); } @@ -980,8 +1150,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( '

' + l10n.addNew + '

' ); + if ( ! themes.isInstall && themes.data.settings.canInstall ) { + this.$el.append( '

' + l10n.addNew + '

' ); } this.parent.page++; @@ -1009,7 +1179,7 @@ themes.view.Themes = wp.Backbone.View.extend({ // 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 ); @@ -1027,6 +1197,22 @@ themes.view.Themes = wp.Backbone.View.extend({ }); 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 @@ -1280,6 +1466,8 @@ themes.view.InstallerSearch = themes.view.Search.extend({ 'keyup': 'search' }, + terms: '', + // Handles Ajax request for searching through themes in public repo search: function( event ) { @@ -1301,6 +1489,14 @@ themes.view.InstallerSearch = themes.view.Search.extend({ 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. @@ -1322,7 +1518,7 @@ themes.view.InstallerSearch = themes.view.Search.extend({ } $( '.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 @@ -1345,7 +1541,9 @@ themes.view.Installer = themes.view.Appearance.extend({ '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 @@ -1437,6 +1635,12 @@ themes.view.Installer = themes.view.Appearance.extend({ $( '.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 ); }, @@ -1460,7 +1664,7 @@ themes.view.Installer = themes.view.Appearance.extend({ // 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 @@ -1498,6 +1702,35 @@ themes.view.Installer = themes.view.Appearance.extend({ 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() { @@ -1528,16 +1761,18 @@ themes.view.Installer = themes.view.Appearance.extend({ // 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' ) ); }); }, @@ -1592,7 +1827,6 @@ themes.InstallerRouter = Backbone.Router.extend({ 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' }, @@ -1658,6 +1892,9 @@ themes.RunInstaller = { 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 @@ -1671,11 +1908,6 @@ themes.RunInstaller = { 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' );