From e5745705fcbb5bf0f9462ec60ca3209cdd9119aa Mon Sep 17 00:00:00 2001 From: Alexei Peters Date: Tue, 30 Apr 2019 16:37:31 -0700 Subject: [PATCH] load search components dynamically, re #4771 --- arches/app/media/js/views/search.js | 12 +----------- arches/app/templates/javascript.htm | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js index af0bf868379..ec9eee2ad93 100644 --- a/arches/app/media/js/views/search.js +++ b/arches/app/media/js/views/search.js @@ -6,21 +6,11 @@ define([ 'arches', 'viewmodels/alert', 'search-components', - 'views/components/search/base-filter', - 'views/components/search/time-filter', - 'views/components/search/term-filter', - 'views/components/search/map-filter', - 'views/components/search/provisional-filter', - 'views/components/search/advanced-search', - 'views/components/search/resource-type-filter', - 'views/components/search/related-resources-filter', - 'views/components/search/search-results', - 'views/components/search/saved-searches', 'views/base-manager', 'view-data', 'search-data', 'views/components/simple-switch' -], function($, _, ko, koMapping, arches, AlertViewModel, SearchComponents, BaseFilter, TimeFilter, TermFilter, MapFilter, ProvisionalFilter, AdvancedSearch, ResourceTypeFilter, RelatedResourcesManager, SearchResults, SavedSearches, BaseManagerView, viewData, searchData) { +], function($, _, ko, koMapping, arches, AlertViewModel, SearchComponents, BaseManagerView, viewData, searchData) { // a method to track the old and new values of a subscribable // from https://github.com/knockout/knockout/issues/914 // diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm index 1d1c68edad4..1040077ac1a 100644 --- a/arches/app/templates/javascript.htm +++ b/arches/app/templates/javascript.htm @@ -414,8 +414,8 @@ {% autoescape off %}return {{geoms}};{% endautoescape %} }); - define('search-components', ['views/components/search/term-filter','views/components/search/time-filter'], function () { - return + define('search-components', [{% for component in search_components %}'{{ component.componentpath }}',{% endfor %}], function () { + return; }); define('leaflet-draw-local', [