You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2020/06/26 19:02:47 UTC
[nifi] branch master updated (a2c88bc -> 87ec855)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from a2c88bc NIFI-6163 Reporting task cannot be set to running when in INVALID state
new 7df2421 NIFI-7577 Upgrade angular version.
new 87ec855 NIFI-7577 Update jquery usages.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../nifi-web/nifi-web-ui/src/main/frontend/package-lock.json | 6 +++---
.../nifi-web/nifi-web-ui/src/main/frontend/package.json | 2 +-
.../main/webapp/js/jquery/propertytable/jquery.propertytable.js | 8 ++++----
.../nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-variable-registry.js | 4 ++--
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
[nifi] 02/02: NIFI-7577 Update jquery usages.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 87ec8558a40819fec6adfb78e6d463f1d94d55ab
Author: mtien <mt...@gmail.com>
AuthorDate: Thu Jun 25 09:56:19 2020 -0700
NIFI-7577 Update jquery usages.
This closes #4357
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
.../main/webapp/js/jquery/propertytable/jquery.propertytable.js | 8 ++++----
.../nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-variable-registry.js | 4 ++--
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 4b08a31..6380524 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -293,11 +293,11 @@
});
// create the button panel
- var stringCheckPanel = $('<div class="string-check-container">');
+ var stringCheckPanel = $('<div class="string-check-container" />');
stringCheckPanel.appendTo(wrapper);
// build the custom checkbox
- isEmpty = $('<div class="nf-checkbox string-check"/>')
+ isEmpty = $('<div class="nf-checkbox string-check" />')
.on('change', function (event, args) {
// if we are setting as an empty string, disable the editor
if (args.isChecked) {
@@ -953,7 +953,7 @@
});
// create the input field
- $('<textarea hidefocus rows="5" readonly="readonly"/>').css({
+ $('<textarea hidefocus rows="5" readonly="readonly" />').css({
'height': '80px',
'resize': 'both',
'width': cellNode.width() + 'px',
@@ -1337,7 +1337,7 @@
content.find('.ellipsis').width(columnDef.width - 10).ellipsis();
// return the appropriate markup
- return $('<div/>').append(content).html();
+ return $('<div />').append(content).html();
};
var propertyColumns = [
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
index fdd59d4..a684bab 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
@@ -52,7 +52,7 @@
var tabPane = $(this);
// create the unorder list
- var tabList = $('<ul/>').addClass('tab-pane');
+ var tabList = $('<ul />').addClass('tab-pane');
var shownTab = false;
// create each tab
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
index 8f87975..7931526 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
@@ -331,7 +331,7 @@
editRemotePort.show();
}
} else if (port.exists === false) {
- $('<div class="remote-port-removed"/>').appendTo(portContainerEditContainer).qtip($.extend({},
+ $('<div class="remote-port-removed" />').appendTo(portContainerEditContainer).qtip($.extend({},
nfCommon.config.tooltipConfig,
{
content: 'This port has been removed.'
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
index 68a322e..fb31190 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
@@ -123,11 +123,11 @@
});
// create the button panel
- var stringCheckPanel = $('<div class="string-check-container">');
+ var stringCheckPanel = $('<div class="string-check-container" />');
stringCheckPanel.appendTo(wrapper);
// build the custom checkbox
- isEmpty = $('<div class="nf-checkbox string-check"/>')
+ isEmpty = $('<div class="nf-checkbox string-check" />')
.on('change', function (event, args) {
// if we are setting as an empty string, disable the editor
if (args.isChecked) {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
index 9296f21..7ae67da 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
@@ -200,7 +200,7 @@
$('#shell-dialog').modal('show');
// create the content container
- var contentContainer = $('<div>').addClass('shell-content-container').css({
+ var contentContainer = $('<div />').addClass('shell-content-container').css({
width: shell.width(),
height: shell.height()
}).append(content).appendTo(shell);
[nifi] 01/02: NIFI-7577 Upgrade angular version.
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7df2421fe76c0ab2649bc0ad6539c2edad1622ed
Author: mtien <mt...@gmail.com>
AuthorDate: Tue Jun 23 21:22:10 2020 -0700
NIFI-7577 Upgrade angular version.
---
.../nifi-web/nifi-web-ui/src/main/frontend/package-lock.json | 6 +++---
.../nifi-web/nifi-web-ui/src/main/frontend/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
index 0e5e1d1..bb1f954 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
@@ -28,9 +28,9 @@
"integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c="
},
"angular": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz",
- "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ=="
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz",
+ "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg=="
},
"angular-animate": {
"version": "1.7.9",
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
index 63d3953..deef34e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
@@ -17,7 +17,7 @@
"description": "Apache NiFi 3rd party client side resources.",
"dependencies": {
"JSON2": "0.1.0",
- "angular": "1.7.9",
+ "angular": "1.8.0",
"angular-aria": "1.7.9",
"angular-animate": "1.7.9",
"angular-messages": "1.7.9",