diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp index 0c57e65826..be163bef65 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp @@ -25,10 +25,15 @@ + + + + + @@ -50,6 +55,8 @@ ${nf.summary.script.tags} + + diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js index 23af30847c..84dd454dfd 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js @@ -55,6 +55,7 @@ }; var methods = { + /** * Initializes the nf editor. * @@ -118,7 +119,7 @@ } } }); - + // set the size var width = null; if (isDefinedAndNotNull(options.width)) { @@ -183,6 +184,7 @@ } }); }, + /** * Refreshes the editor. */ @@ -196,6 +198,7 @@ } }); }, + /** * Sets the size of the editor. * @@ -212,6 +215,7 @@ } }); }, + /** * Gets the value of the editor in the first matching selector. */ @@ -231,6 +235,7 @@ return value; }, + /** * Sets the value of the editor. * @@ -249,6 +254,7 @@ } }); }, + /** * Sets the focus. */ @@ -262,6 +268,7 @@ } }); }, + /** * Sets the focus. */ @@ -275,6 +282,7 @@ } }); }, + /** * Gets whether the value of the editor in the first matching selector has been modified. */ @@ -288,6 +296,7 @@ return modified; }, + /** * Destroys the editor. */ diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js index ee7c0c5865..220338f77b 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js @@ -59,6 +59,8 @@ nf.ProcessorDetails = (function () { 'left': offset.left - 5 }).appendTo('body'); + var editor = null; + // so the nfel editor is appropriate if (supportsEl(propertyDescriptor)) { var languageId = 'nfel'; @@ -71,7 +73,7 @@ nf.ProcessorDetails = (function () { }); // create the editor - $('
').addClass(editorClass).appendTo(wrapper).nfeditor({ + editor = $('
').addClass(editorClass).appendTo(wrapper).nfeditor({ languageId: languageId, width: cellNode.width(), content: property.value, @@ -101,6 +103,12 @@ nf.ProcessorDetails = (function () { // add an ok button that will remove the entire pop up var ok = $('
Ok
').on('click', function () { + // clean up the editor + if (editor !== null) { + editor.nfeditor('destroy'); + } + + // clean up the rest wrapper.hide().remove(); }); $('
').css({