From d017c407476d6cadccc56d650999cc54efd26e99 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 23 Oct 2014 16:55:25 -0700 Subject: [PATCH] Fixed: Show search for existing series that finds no results --- src/UI/.idea/inspectionProfiles/Project_Default.xml | 7 ------- src/UI/AddSeries/AddSeriesView.js | 1 + src/UI/AddSeries/NotFoundView.js | 2 +- .../{NotFoundTemplate.hbs => NotFoundViewTemplate.hbs} | 0 src/UI/Shared/NotFoundView.js | 2 +- .../{NotFoundTemplate.hbs => NotFoundViewTemplate.hbs} | 0 6 files changed, 3 insertions(+), 9 deletions(-) rename src/UI/AddSeries/{NotFoundTemplate.hbs => NotFoundViewTemplate.hbs} (100%) rename src/UI/Shared/{NotFoundTemplate.hbs => NotFoundViewTemplate.hbs} (100%) diff --git a/src/UI/.idea/inspectionProfiles/Project_Default.xml b/src/UI/.idea/inspectionProfiles/Project_Default.xml index 623a988ad..7f20f79f3 100644 --- a/src/UI/.idea/inspectionProfiles/Project_Default.xml +++ b/src/UI/.idea/inspectionProfiles/Project_Default.xml @@ -109,13 +109,6 @@ - - - diff --git a/src/UI/AddSeries/AddSeriesView.js b/src/UI/AddSeries/AddSeriesView.js index 8ea8be65d..b141617d7 100644 --- a/src/UI/AddSeries/AddSeriesView.js +++ b/src/UI/AddSeries/AddSeriesView.js @@ -134,6 +134,7 @@ define( if (!this.isClosed) { if (this.collection.length === 0) { + this.ui.searchBar.show(); this.searchResult.show(new NotFoundView({term: this.collection.term})); } else { diff --git a/src/UI/AddSeries/NotFoundView.js b/src/UI/AddSeries/NotFoundView.js index e59c3e4f5..6a85bfbf2 100644 --- a/src/UI/AddSeries/NotFoundView.js +++ b/src/UI/AddSeries/NotFoundView.js @@ -6,7 +6,7 @@ define( ], function (Marionette) { return Marionette.CompositeView.extend({ - template: 'AddSeries/NotFoundTemplate', + template: 'AddSeries/NotFoundViewTemplate', initialize: function (options) { this.options = options; diff --git a/src/UI/AddSeries/NotFoundTemplate.hbs b/src/UI/AddSeries/NotFoundViewTemplate.hbs similarity index 100% rename from src/UI/AddSeries/NotFoundTemplate.hbs rename to src/UI/AddSeries/NotFoundViewTemplate.hbs diff --git a/src/UI/Shared/NotFoundView.js b/src/UI/Shared/NotFoundView.js index 2d570d19c..87e196230 100644 --- a/src/UI/Shared/NotFoundView.js +++ b/src/UI/Shared/NotFoundView.js @@ -4,7 +4,7 @@ define( 'marionette' ], function (Marionette) { return Marionette.ItemView.extend({ - template: 'Shared/notfoundtemplate' + template: 'Shared/NotFoundViewTemplate' }); }); diff --git a/src/UI/Shared/NotFoundTemplate.hbs b/src/UI/Shared/NotFoundViewTemplate.hbs similarity index 100% rename from src/UI/Shared/NotFoundTemplate.hbs rename to src/UI/Shared/NotFoundViewTemplate.hbs