You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/16 18:37:20 UTC

[34/50] [abbrv] incubator-nifi git commit: NIFI-27: - Better result normalization. - Updated styles.

NIFI-27:
- Better result normalization.
- Updated styles.

Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d307a13c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d307a13c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d307a13c

Branch: refs/heads/develop
Commit: d307a13c5d4610dd3aa8bdeacab850725bedeb7d
Parents: 68e0898
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Dec 12 10:37:02 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Dec 12 10:37:02 2014 -0500

----------------------------------------------------------------------
 .../framework/web/nifi-web-ui/src/main/webapp/css/header.css  | 1 +
 .../web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
----------------------------------------------------------------------
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 6b096a1..0f08b47 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 {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
----------------------------------------------------------------------
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 c1c4117..2016721 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) {