From 3aa0d455c944a4c3230dddc36994643dd9b83a94 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 27 Nov 2012 15:05:32 -0500 Subject: [PATCH] search: remove SearchResultDisplay base class It's unused, and the clear() method is just wrong. Remove it. https://bugzilla.gnome.org/show_bug.cgi?id=681797 --- js/ui/search.js | 43 ------------------------------------------ js/ui/searchDisplay.js | 6 ++---- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/js/ui/search.js b/js/ui/search.js index 827e34d9b..b64de7e4c 100644 --- a/js/ui/search.js +++ b/js/ui/search.js @@ -21,49 +21,6 @@ const MatchType = { PREFIX: 2 }; -const SearchResultDisplay = new Lang.Class({ - Name: 'SearchResultDisplay', - - _init: function(provider) { - this.provider = provider; - this.actor = null; - }, - - /** - * renderResults: - * @results: List of identifier strings - * @terms: List of search term strings - * - * Display the given search matches which resulted - * from the given terms. It's expected that not - * all results will fit in the space for the container - * actor; in this case, show as many as makes sense - * for your result type. - * - * The terms are useful for search match highlighting. - */ - renderResults: function(results, terms) { - throw new Error('Not implemented'); - }, - - /** - * clear: - * Remove all results from this display. - */ - clear: function() { - this.actor.destroy_all_children(); - }, - - /** - * getVisibleResultCount: - * - * Returns: The number of actors visible. - */ - getVisibleResultCount: function() { - throw new Error('Not implemented'); - }, -}); - /** * SearchProvider: * diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js index 4db34c59e..08c1c797e 100644 --- a/js/ui/searchDisplay.js +++ b/js/ui/searchDisplay.js @@ -159,10 +159,9 @@ const GridSearchResult = new Lang.Class({ const ListSearchResults = new Lang.Class({ Name: 'ListSearchResults', - Extends: Search.SearchResultDisplay, _init: function(provider) { - this.parent(provider); + this.provider = provider; this.actor = new St.BoxLayout({ style_class: 'search-section-content' }); this.providerIcon = new ProviderIcon(provider); @@ -231,10 +230,9 @@ const ListSearchResults = new Lang.Class({ const GridSearchResults = new Lang.Class({ Name: 'GridSearchResults', - Extends: Search.SearchResultDisplay, _init: function(provider, grid) { - this.parent(provider); + this.provider = provider; this._grid = grid || new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS, xAlign: St.Align.START });