Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-7577 Upgrade angular version. #4357

Closed
wants to merge 2 commits into from
Closed

NIFI-7577 Upgrade angular version. #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e0d0f8
NIFI-7577 Upgrade angular version.
mtien-apache Jun 24, 2020
21ff096
NIFI-7577 Update jquery usages.
mtien-apache Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions ...work/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
View file
Open in desktop
Expand Up @@ -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) {
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion ...undle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/tabbs/jquery.tabbs.js
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...mework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
View file
Open in desktop
Expand Up @@ -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.'
Expand Down
4 changes: 2 additions & 2 deletions .../nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...fi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
View file
Open in desktop
Expand Up @@ -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);
Expand Down