Repository: incubator-nifi
Updated Branches:
  refs/heads/develop f66545145 -> 0133f8471


Treating description as HTML as it has been properly escaped when added to the 
SlickGrid DataView

Signed-off-by: Matt Gilman <[email protected]>


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

Branch: refs/heads/develop
Commit: 1dc879c131834682aa2cd26236e26d1bf738e855
Parents: d36a71c
Author: Aldrin Piri <[email protected]>
Authored: Sun Feb 8 21:37:20 2015 -0500
Committer: Matt Gilman <[email protected]>
Committed: Mon Feb 9 07:31:15 2015 -0500

----------------------------------------------------------------------
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1dc879c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
----------------------------------------------------------------------
diff --git 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
index ee91107..8d005e2 100644
--- 
a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
+++ 
b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
@@ -975,7 +975,7 @@ nf.CanvasToolbox = (function () {
                         if (nf.Common.isBlank(processorType.description)) {
                             $('#processor-type-description').attr('title', 
'').html('<span class="unset">No description specified</span>');
                         } else {
-                            
$('#processor-type-description').text(processorType.description).ellipsis();
+                            
$('#processor-type-description').html(processorType.description).ellipsis();
                         }
 
                         // populate the dom

Reply via email to