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 2015/01/07 14:11:24 UTC
incubator-nifi git commit: NIFI-216: - Code clean up. - Ensuring the
appropriate scripts/stylesheets are referenced in Summary page.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 4d11ff783 -> 645837491
NIFI-216:
- Code clean up.
- Ensuring the appropriate scripts/stylesheets are referenced in Summary page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/64583749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/64583749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/64583749
Branch: refs/heads/develop
Commit: 645837491c13006b9546dc3c952a90479366e791
Parents: 4d11ff7
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Jan 7 07:46:57 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Jan 7 07:46:57 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/pages/summary.jsp | 7 +++++++
.../main/webapp/js/jquery/nfeditor/jquery.nfeditor.js | 11 ++++++++++-
.../src/main/webapp/js/nf/nf-processor-details.js | 10 +++++++++-
3 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/64583749/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
----------------------------------------------------------------------
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 0c57e65..be163be 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 @@
<link rel="stylesheet" href="js/jquery/tabbs/jquery.tabbs.css?${project.version}" type="text/css" />
<link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" />
<link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" />
+ <link rel="stylesheet" href="js/codemirror/lib/codemirror.css" type="text/css" />
+ <link rel="stylesheet" href="js/codemirror/addon/hint/show-hint.css" type="text/css" />
+ <link rel="stylesheet" href="js/jquery/nfeditor/jquery.nfeditor.css?${project.version}" type="text/css" />
+ <link rel="stylesheet" href="js/jquery/nfeditor/languages/nfel.css?${project.version}" type="text/css" />
<link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" />
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script>
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -50,6 +55,8 @@
<script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script>
<script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script>
${nf.summary.script.tags}
+ <script type="text/javascript" src="js/jquery/nfeditor/languages/nfel.js?${project.version}"></script>
+ <script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script>
</head>
<body>
<jsp:include page="/WEB-INF/partials/message-pane.jsp"/>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/64583749/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
----------------------------------------------------------------------
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 23af308..84dd454 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.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/64583749/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
----------------------------------------------------------------------
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 ee7c0c5..220338f 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
- $('<div></div>').addClass(editorClass).appendTo(wrapper).nfeditor({
+ editor = $('<div></div>').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 = $('<div class="button button-normal">Ok</div>').on('click', function () {
+ // clean up the editor
+ if (editor !== null) {
+ editor.nfeditor('destroy');
+ }
+
+ // clean up the rest
wrapper.hide().remove();
});
$('<div></div>').css({