diff options
| -rw-r--r-- | js/fulltextsearch.v1.result.js | 4 | ||||
| -rw-r--r-- | js/fulltextsearch.v1.searchbox.js | 51 | ||||
| -rw-r--r-- | lib/Model/Index.php | 12 | ||||
| -rw-r--r-- | templates/navigate.php | 1 |
4 files changed, 15 insertions, 53 deletions
diff --git a/js/fulltextsearch.v1.result.js b/js/fulltextsearch.v1.result.js index 9e72f6f..0542f5a 100644 --- a/js/fulltextsearch.v1.result.js +++ b/js/fulltextsearch.v1.result.js @@ -52,7 +52,6 @@ var result = { displayError: function (res) { - console.log('searching returns an error: ' + res.error); box_elements.searchError.text(res.error).show(); }, @@ -72,7 +71,8 @@ var result = { var current = curr.getProviderResult(result.provider.id); var divProvider = nav.getDivProvider(result.provider.id, result.provider.name); - nav.manageDivProviderNavigation(divProvider.children('.provider_navigation'), request, result.meta); + nav.manageDivProviderNavigation(divProvider.children('.provider_navigation'), request, + result.meta); nav.manageDivProviderResult(divProvider.children('.provider_result'), result.documents, current.documents); diff --git a/js/fulltextsearch.v1.searchbox.js b/js/fulltextsearch.v1.searchbox.js index 313d5d6..cf6a55b 100644 --- a/js/fulltextsearch.v1.searchbox.js +++ b/js/fulltextsearch.v1.searchbox.js @@ -84,7 +84,6 @@ var searchbox = { } }); - }, @@ -214,30 +213,6 @@ var searchbox = { * * */ - // - // - // initFullTextSearchBox: function () { - // if (box_elements.searchBoxInitialized) { - // return; - // } - // var self = this; - // - // box_elements.search_input.unbind('keyup'); - // box_elements.search_input.bind('keyup blur change', function () { - // if ($(this).val() === '') { - // self.displaySearchOptionsIcon(false); - // } else { - // self.displaySearchOptionsIcon(true); - // } - // - // self.searching(); - // }); - // - // box_elements.searchBoxInitialized = true; - // }, - // - - getSearchOptions: function () { var options = {}; @@ -256,32 +231,6 @@ var searchbox = { }); return options; - }, - - - // TODO: do we really need this initSearch, or should we use the one from fulltextsearch.js !? - initSearch: function (force) { - // var search = searchbox.search_input.val(); - // - // if (!force && search.length < 3) { - // return false; - // } - // - // if (curr.lastRequest === search) { - // return true; - // } - // - // curr.lastRequest = search; - // - // fullTextSearch.search({ - // providers: settings.searchProviderId, - // search: search, - // page: curr.page, - // options: searchbar.getSearchOptions(), - // size: 20 - // }); - // - // return true; } diff --git a/lib/Model/Index.php b/lib/Model/Index.php index fb3c91a..a390e6a 100644 --- a/lib/Model/Index.php +++ b/lib/Model/Index.php @@ -268,4 +268,16 @@ class Index implements \JsonSerializable { ]; } + + public function __destruct() { + unset($this->providerId); + unset($this->documentId); + unset($this->ownerId); + unset($this->status); + unset($this->options); + unset($this->err); + unset($this->message); + unset($this->lastIndex); + } + }
\ No newline at end of file diff --git a/templates/navigate.php b/templates/navigate.php index ac80dfc..f9f58cd 100644 --- a/templates/navigate.php +++ b/templates/navigate.php @@ -52,6 +52,7 @@ Util::addStyle(Application::APP_NAME, 'navigate'); </div> <div id="app-content"> + <div id="search_error"></div> <div id="search_result"></div> </div> |