enmi-conf.org: comparison wp/wp-admin/js/theme.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-admin/js/theme.js

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 		_.bindAll( this, 'scroller' );
 		this.SearchView = options.SearchView ? options.SearchView : themes.view.Search;
 		// Bind to the scroll event and throttle
 		// the results from this.scroller.
-		this.window.bind( 'scroll', _.throttle( this.scroller, 300 ) );
+		this.window.on( 'scroll', _.throttle( this.scroller, 300 ) );
 	},
 	// Main render control.
 	render: function() {
 		// Setup the main theme view
 	render: function() {
 		var data = this.model.toJSON();
 		// Render themes using the html template.
-		this.$el.html( this.html( data ) ).attr({
+		this.$el.html( this.html( data ) ).attr( 'data-slug', data.id );
-			tabindex: 0,
-			'aria-describedby' : data.id + '-action ' + data.id + '-name',
-			'data-slug': data.id
-		});
 		// Renders active theme styles.
 		this.activeTheme();
 		if ( this.model.get( 'displayAuthor' ) ) {
 			preview.model = self.current;
 			// Render and append.
 			preview.render();
 			this.setNavButtonsState();
-			$( '.next-theme' ).focus();
+			$( '.next-theme' ).trigger( 'focus' );
 		})
 		.listenTo( preview, 'theme:previous', function() {
 			// Keep track of current theme model.
 			current = self.model;
 			preview.model = self.current;
 			// Render and append.
 			preview.render();
 			this.setNavButtonsState();
-			$( '.previous-theme' ).focus();
+			$( '.previous-theme' ).trigger( 'focus' );
 		});
 		this.listenTo( preview, 'preview:close', function() {
 			self.current = self.model;
 		});
 		if ( 0 === this.model.collection.indexOf( current ) ) {
 			previousThemeButton
 				.addClass( 'disabled' )
 				.prop( 'disabled', true );
-			nextThemeButton.focus();
+			nextThemeButton.trigger( 'focus' );
 		}
 		// Disable next if the next model is undefined.
 		if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {
 			nextThemeButton
 				.addClass( 'disabled' )
 				.prop( 'disabled', true );
-			previousThemeButton.focus();
+			previousThemeButton.trigger( 'focus' );
 		}
 	},
 	installTheme: function( event ) {
 		var _this = this;
 	// Set initial focus and constrain tabbing within the theme browser modal.
 	containFocus: function( $el ) {
 		// Set initial focus on the primary action control.
 		_.delay( function() {
-			$( '.theme-overlay' ).focus();
+			$( '.theme-overlay' ).trigger( 'focus' );
 		}, 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();
 			// Check for the Tab key.
 			if ( 9 === event.which ) {
 				if ( $firstFocusable[0] === event.target && event.shiftKey ) {
-					$lastFocusable.focus();
+					$lastFocusable.trigger( 'focus' );
 					event.preventDefault();
 				} else if ( $lastFocusable[0] === event.target && ! event.shiftKey ) {
-					$firstFocusable.focus();
+					$firstFocusable.trigger( 'focus' );
 					event.preventDefault();
 				}
 			}
 		});
 	},
 				// Restore scroll position.
 				document.body.scrollTop = scroll;
 				// Return focus to the theme div.
 				if ( themes.focusedTheme ) {
-					themes.focusedTheme.focus();
+					themes.focusedTheme.find('.more-details').trigger( 'focus' );
 				}
 			});
 		}
 	},
 		this.$el.fadeOut( 200, function() {
 			$( 'body' ).removeClass( 'theme-installer-active full-overlay-active' );
 			// Return focus to the theme div.
 			if ( themes.focusedTheme ) {
-				themes.focusedTheme.focus();
+				themes.focusedTheme.find('.more-details').trigger( 'focus' );
 			}
 		}).removeClass( 'iframe-ready' );
 		// Restore the previous browse tab if available.
 		if ( themes.router.selectedTab ) {
 	init: function() {
 		// Set up the view.
 		// Passes the default 'section' as an option.
 		this.view = new themes.view.Installer({
-			section: 'featured',
+			section: 'popular',
 			SearchView: themes.view.InstallerSearch
 		});
 		// Render results.
 		this.render();
 		});
 		/*
 		 * Handles sorting / browsing routes.
 		 * Also handles the root URL triggering a sort request
-		 * for `featured`, the default view.
+		 * for `popular`, the default view.
 		 */
 		themes.router.on( 'route:sort', function( sort ) {
 			if ( ! sort ) {
-				sort = 'featured';
+				sort = 'popular';
-				themes.router.navigate( themes.router.baseUrl( '?browse=featured' ), { replace: true } );
+				themes.router.navigate( themes.router.baseUrl( '?browse=popular' ), { replace: true } );
 			}
 			self.view.sort( sort );
 			// Close the preview if open.
 			if ( themes.preview ) {
 			}
 		});
 		// The `search` route event. The router populates the input field.
 		themes.router.on( 'route:search', function() {
-			$( '.wp-filter-search' ).focus().trigger( 'keyup' );
+			$( '.wp-filter-search' ).trigger( 'focus' ).trigger( 'keyup' );
 		});
 		this.extraRoutes();
 	},
 		return false;
 	}
 };
 // Ready...
-$( document ).ready(function() {
+$( function() {
 	if ( themes.isInstall ) {
 		themes.RunInstaller.init();
 	} else {
 		themes.Run.init();
 	}
 });
 })( jQuery );
 // Align theme browser thickbox.
-jQuery(document).ready( function($) {
+jQuery( function($) {
 	window.tb_position = function() {
 		var tbWindow = $('#TB_window'),
 			width = $(window).width(),
 			H = $(window).height(),
 			W = ( 1040 < width ) ? 1040 : width,
 		if ( $('#wpadminbar').length ) {
 			adminbar_height = parseInt( $('#wpadminbar').css('height'), 10 );
 		}
-		if ( tbWindow.size() ) {
+		if ( tbWindow.length >= 1 ) {
 			tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
 			$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
 			tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
 			if ( typeof document.body.style.maxWidth !== 'undefined' ) {
 				tbWindow.css({'top': 20 + adminbar_height + 'px', 'margin-top': '0'});
 			}
 		}
 	};
-	$(window).resize(function(){ tb_position(); });
+	$(window).on( 'resize', function(){ tb_position(); });
 });

enmi-conf.org