From d307a13c5d4610dd3aa8bdeacab850725bedeb7d Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Fri, 12 Dec 2014 10:37:02 -0500 Subject: [PATCH] NIFI-27: - Better result normalization. - Updated styles. --- .../web/nifi-web-ui/src/main/webapp/css/header.css | 1 + .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css index 6b096a13f1..0f08b47019 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css @@ -456,6 +456,7 @@ input.search-flow { overflow: auto; border: 1px solid #aaaaaa; z-index: 1251; + border-radius: 0; } #search-flow-results .ui-menu .ui-menu-item a.ui-state-focus { diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js index c1c4117a82..20167219aa 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js @@ -36,6 +36,11 @@ nf.Search = (function () { var ul = this.menu.element; ul.width(399); }, + _normalize: function(searchResults) { + var items = []; + items.push(searchResults); + return items; + }, _renderMenu: function (ul, items) { var self = this; @@ -130,7 +135,7 @@ nf.Search = (function () { dataType: 'json', url: config.urls.search }).done(function (searchResponse) { - response(searchResponse); + response(searchResponse.searchResultsDTO); }); }, select: function (event, ui) {