Advertisement
Guest User

Untitled

a guest
Jul 21st, 2017
51
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.91 KB | None | 0 0
  1. diff --git a/js/ui/search.js b/js/ui/search.js
  2. index ecc9ccb..b773594 100644
  3. --- a/js/ui/search.js
  4. +++ b/js/ui/search.js
  5. @@ -396,7 +396,6 @@ SearchSystem.prototype = {
  6. let [provider2, results] = this._previousResults[index];
  7. if (provider !== provider2)
  8. return;
  9. -
  10. results.push.apply(results, items);
  11. this.emit('results-updated', this._previousResults);
  12. },
  13. diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
  14. index 491ec3c..360b510 100644
  15. --- a/js/ui/searchDisplay.js
  16. +++ b/js/ui/searchDisplay.js
  17. @@ -192,9 +192,11 @@ SearchResults.prototype = {
  18. this._selectedProvider = -1;
  19. this._providers = this._searchSystem.getProviders();
  20. this._providerMeta = [];
  21. - for (let i = 0; i < this._providers.length; i++)
  22. + this._providerMetaResults = {};
  23. + for (let i = 0; i < this._providers.length; i++) {
  24. this.createProviderMeta(this._providers[i]);
  25. -
  26. + this._providerMetaResults[this.providers[i].title] = [];
  27. + }
  28. this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
  29. this.actor.add(this._searchProvidersBox);
  30.  
  31. @@ -282,6 +284,12 @@ SearchResults.prototype = {
  32. meta.actor.hide();
  33. }
  34. },
  35. +
  36. + _clearDisplayForProvider: function(index) {
  37. + let meta = this._providerMeta[index];
  38. + meta.resultDisplay.clear();
  39. + meta.actor.hide();
  40. + },
  41.  
  42. reset: function() {
  43. this._searchSystem.reset();
  44. @@ -306,7 +314,7 @@ SearchResults.prototype = {
  45. },
  46.  
  47. _updateResults: function(searchSystem, results) {
  48. - this._clearDisplay();
  49. + //this._clearDisplay();
  50. if (results.length == 0) {
  51. this._statusText.set_text(_("No matching results."));
  52. this._statusText.show();
  53. @@ -322,13 +330,18 @@ SearchResults.prototype = {
  54. for (let i = 0; i < results.length; i++) {
  55. let [provider, providerResults] = results[i];
  56. if (providerResults.length == 0)
  57. - continue;
  58. - let meta = this._metaForProvider(provider);
  59. - meta.actor.show();
  60. - meta.resultDisplay.renderResults(providerResults, terms);
  61. - meta.count.set_text('' + providerResults.length);
  62. + this._clearDisplayForProvider(i)
  63. + else{
  64. + if (this._providerMetaResults[provider.title] != providerResults){
  65. + this._providerMetaResults[provider.title] = providerResults;
  66. + this._clearDisplayForProvider(i);
  67. + let meta = this._metaForProvider(provider);
  68. + meta.actor.show();
  69. + meta.resultDisplay.renderResults(providerResults, terms);
  70. + meta.count.set_text('' + providerResults.length);
  71. + }
  72. + }
  73. }
  74. -
  75. if (this._selectedOpenSearchButton == -1)
  76. this.selectDown(false);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement