X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-admin/js/theme.js

diff --git a/wp-admin/js/theme.js b/wp-admin/js/theme.js
index 57e33127..2cf5f770 100644
--- a/wp-admin/js/theme.js
+++ b/wp-admin/js/theme.js
@@ -79,7 +79,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 
 		// Render and append
 		this.view.render();
-		this.$el.empty().append( this.view.el ).addClass('rendered');
+		this.$el.empty().append( this.view.el ).addClass( 'rendered' );
 		this.$el.append( '<br class="clear"/>' );
 	},
 
@@ -156,6 +156,7 @@ themes.Collection = Backbone.Collection.extend({
 		// Useful for resetting the views when you clean the input
 		if ( this.terms === '' ) {
 			this.reset( themes.data.themes );
+			$( 'body' ).removeClass( 'no-results' );
 		}
 
 		// Trigger an 'update' event
@@ -165,7 +166,7 @@ themes.Collection = Backbone.Collection.extend({
 	// Performs a search within the collection
 	// @uses RegExp
 	search: function( term ) {
-		var match, results, haystack;
+		var match, results, haystack, name, description, author;
 
 		// Start with a full collection
 		this.reset( themes.data.themes, { silent: true } );
@@ -181,7 +182,11 @@ themes.Collection = Backbone.Collection.extend({
 		// Find results
 		// _.filter and .test
 		results = this.filter( function( data ) {
-			haystack = _.union( data.get( 'name' ), data.get( 'id' ), data.get( 'description' ), data.get( 'author' ), data.get( 'tags' ) );
+			name        = data.get( 'name' ).replace( /(<([^>]+)>)/ig, '' );
+			description = data.get( 'description' ).replace( /(<([^>]+)>)/ig, '' );
+			author      = data.get( 'author' ).replace( /(<([^>]+)>)/ig, '' );
+
+			haystack = _.union( name, data.get( 'id' ), description, author, data.get( 'tags' ) );
 
 			if ( match.test( data.get( 'author' ) ) && term.length > 2 ) {
 				data.set( 'displayAuthor', true );
@@ -763,7 +768,7 @@ themes.view.Preview = themes.view.Details.extend({
 
 		this.$el.html( this.html( data ) );
 
-		themes.router.navigate( themes.router.baseUrl( '?theme=' + this.model.get( 'id' ) ), { replace: true } );
+		themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
 
 		this.$el.fadeIn( 200, function() {
 			$( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
@@ -824,7 +829,10 @@ themes.view.Themes = wp.Backbone.View.extend({
 	index: 0,
 
 	// The theme count element
-	count: $( '.theme-count' ),
+	count: $( '.wp-core-ui .theme-count' ),
+
+	// The live themes count
+	liveThemeCount: 0,
 
 	initialize: function( options ) {
 		var self = this;
@@ -849,8 +857,10 @@ themes.view.Themes = wp.Backbone.View.extend({
 		this.listenTo( self.collection, 'query:success', function( count ) {
 			if ( _.isNumber( count ) ) {
 				self.count.text( count );
+				self.announceSearchResults( count );
 			} else {
 				self.count.text( self.collection.length );
+				self.announceSearchResults( self.collection.length );
 			}
 		});
 
@@ -895,7 +905,7 @@ themes.view.Themes = wp.Backbone.View.extend({
 	// and keeping theme count in sync
 	render: function() {
 		// Clear the DOM, please
-		this.$el.html( '' );
+		this.$el.empty();
 
 		// If the user doesn't have switch capabilities
 		// or there is only one theme in the collection
@@ -921,7 +931,10 @@ themes.view.Themes = wp.Backbone.View.extend({
 		}
 
 		// Display a live theme count for the collection
-		this.count.text( this.collection.count ? this.collection.count : this.collection.length );
+		this.liveThemeCount = this.collection.count ? this.collection.count : this.collection.length;
+		this.count.text( this.liveThemeCount );
+
+		this.announceSearchResults( this.liveThemeCount );
 	},
 
 	// Iterates through each instance of the collection
@@ -996,7 +1009,7 @@ themes.view.Themes = wp.Backbone.View.extend({
 		this.model = self.collection.get( id );
 
 		// Trigger a route update for the current model
-		themes.router.navigate( themes.router.baseUrl( '?theme=' + this.model.id ) );
+		themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.id ) );
 
 		// Sets this.view to 'detail'
 		this.setView( 'detail' );
@@ -1073,6 +1086,15 @@ themes.view.Themes = wp.Backbone.View.extend({
 			self.theme.trigger( 'theme:expand', previousModel.cid );
 
 		}
+	},
+
+	// Dispatch audible search results feedback message
+	announceSearchResults: function( count ) {
+		if ( 0 === count ) {
+			wp.a11y.speak( l10n.noThemesFound );
+		} else {
+			wp.a11y.speak( l10n.themesFound.replace( '%d', count ) );
+		}
 	}
 });
 
@@ -1086,15 +1108,14 @@ themes.view.Search = wp.Backbone.View.extend({
 
 	attributes: {
 		placeholder: l10n.searchPlaceholder,
-		type: 'search'
+		type: 'search',
+		'aria-describedby': 'live-search-desc'
 	},
 
 	events: {
-		'input':  'search',
-		'keyup':  'search',
-		'change': 'search',
-		'search': 'search',
-		'blur':   'pushState'
+		'input': 'search',
+		'keyup': 'search',
+		'blur': 'pushState'
 	},
 
 	initialize: function( options ) {
@@ -1107,19 +1128,21 @@ themes.view.Search = wp.Backbone.View.extend({
 
 	},
 
-	// Runs a search on the theme collection.
 	search: function( event ) {
-		var options = {};
-
 		// Clear on escape.
 		if ( event.type === 'keyup' && event.which === 27 ) {
 			event.target.value = '';
 		}
 
-		// Lose input focus when pressing enter
-		if ( event.which === 13 ) {
-			this.$el.trigger( 'blur' );
-		}
+		/**
+		 * Since doSearch is debounced, it will only run when user input comes to a rest
+		 */
+		this.doSearch( event );
+	},
+
+	// Runs a search on the theme collection.
+	doSearch: _.debounce( function( event ) {
+		var options = {};
 
 		this.collection.doSearch( event.target.value );
 
@@ -1132,17 +1155,17 @@ themes.view.Search = wp.Backbone.View.extend({
 
 		// Update the URL hash
 		if ( event.target.value ) {
-			themes.router.navigate( themes.router.baseUrl( '?search=' + event.target.value ), options );
+			themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );
 		} else {
 			themes.router.navigate( themes.router.baseUrl( '' ) );
 		}
-	},
+	}, 500 ),
 
 	pushState: function( event ) {
 		var url = themes.router.baseUrl( '' );
 
 		if ( event.target.value ) {
-			url = themes.router.baseUrl( '?search=' + event.target.value );
+			url = themes.router.baseUrl( themes.router.searchPath + event.target.value );
 		}
 
 		this.searching = false;
@@ -1167,6 +1190,9 @@ themes.Router = Backbone.Router.extend({
 		return 'themes.php' + url;
 	},
 
+	themePath: '?theme=',
+	searchPath: '?search=',
+
 	search: function( query ) {
 		$( '.wp-filter-search' ).val( query );
 	},
@@ -1244,6 +1270,7 @@ themes.Run = {
 themes.view.InstallerSearch =  themes.view.Search.extend({
 
 	events: {
+		'input': 'search',
 		'keyup': 'search'
 	},
 
@@ -1262,7 +1289,7 @@ themes.view.InstallerSearch =  themes.view.Search.extend({
 			event.target.value = '';
 		}
 
-		_.debounce( _.bind( this.doSearch, this ), 300 )( event.target.value );
+		this.doSearch( event.target.value );
 	},
 
 	doSearch: _.debounce( function( value ) {
@@ -1296,8 +1323,8 @@ themes.view.InstallerSearch =  themes.view.Search.extend({
 		this.collection.query( request );
 
 		// Set route
-		themes.router.navigate( themes.router.baseUrl( '?search=' + value ), { replace: true } );
-	}, 300 )
+		themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + value ), { replace: true } );
+	}, 500 )
 });
 
 themes.view.Installer = themes.view.Appearance.extend({
@@ -1395,7 +1422,7 @@ themes.view.Installer = themes.view.Appearance.extend({
 		this.sort( sort );
 
 		// Trigger a router.naviagte update
-		themes.router.navigate( themes.router.baseUrl( '?browse=' + sort ) );
+		themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + sort ) );
 	},
 
 	sort: function( sort ) {
@@ -1568,6 +1595,10 @@ themes.InstallerRouter = Backbone.Router.extend({
 		return 'theme-install.php' + url;
 	},
 
+	themePath: '?theme=',
+	browsePath: '?browse=',
+	searchPath: '?search=',
+
 	search: function( query ) {
 		$( '.wp-filter-search' ).val( query );
 	},
@@ -1659,6 +1690,10 @@ $( document ).ready(function() {
 	} else {
 		themes.Run.init();
 	}
+
+	$( '.broken-themes .delete-theme' ).on( 'click', function() {
+		return confirm( _wpThemeSettings.settings.confirmDelete );
+	});
 });
 
 })( jQuery );