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 2017/02/23 14:15:10 UTC
[12/12] nifi git commit: [NIFI-3358] update naming conventions to
avoid conflicts. This closes #1533
[NIFI-3358] update naming conventions to avoid conflicts. This closes #1533
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2c374baf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2c374baf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2c374baf
Branch: refs/heads/master
Commit: 2c374bafaa34f48810717455bc36a7ad0ad9b4b9
Parents: 64379d2
Author: Scott Aslan <sc...@gmail.com>
Authored: Wed Feb 22 15:37:45 2017 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 23 09:14:33 2017 -0500
----------------------------------------------------------------------
.../main/webapp/js/jquery/modal/jquery.modal.js | 198 +++++-----
.../js/jquery/nfeditor/jquery.nfeditor.js | 4 +-
.../propertytable/jquery.propertytable.js | 187 ++++-----
.../js/nf/bulletin-board/nf-bulletin-board.js | 48 +--
.../controllers/nf-ng-breadcrumbs-controller.js | 14 +-
.../nf-ng-canvas-flow-status-controller.js | 62 +--
.../nf-ng-canvas-global-menu-controller.js | 48 +--
.../nf-ng-canvas-graph-controls-controller.js | 97 +++--
.../nf-ng-canvas-header-controller.js | 14 +-
.../nf-ng-canvas-navigate-controller.js | 30 +-
.../nf-ng-canvas-operate-controller.js | 44 +--
.../nf-ng-canvas-toolbox-controller.js | 14 +-
.../header/components/nf-ng-funnel-component.js | 16 +-
.../header/components/nf-ng-group-component.js | 18 +-
.../components/nf-ng-input-port-component.js | 18 +-
.../header/components/nf-ng-label-component.js | 20 +-
.../components/nf-ng-output-port-component.js | 18 +-
.../components/nf-ng-processor-component.js | 48 +--
.../nf-ng-remote-process-group-component.js | 22 +-
.../components/nf-ng-template-component.js | 28 +-
.../src/main/webapp/js/nf/canvas/nf-actions.js | 396 +++++++++----------
.../src/main/webapp/js/nf/canvas/nf-birdseye.js | 43 +-
.../webapp/js/nf/canvas/nf-canvas-bootstrap.js | 102 ++---
.../js/nf/canvas/nf-canvas-error-handler.js | 16 +-
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 84 ++--
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 128 +++---
.../main/webapp/js/nf/canvas/nf-clipboard.js | 12 +-
.../webapp/js/nf/canvas/nf-component-state.js | 32 +-
.../main/webapp/js/nf/canvas/nf-connectable.js | 20 +-
.../js/nf/canvas/nf-connection-configuration.js | 210 +++++-----
.../main/webapp/js/nf/canvas/nf-connection.js | 166 ++++----
.../main/webapp/js/nf/canvas/nf-context-menu.js | 107 +++--
.../js/nf/canvas/nf-controller-service.js | 160 ++++----
.../js/nf/canvas/nf-controller-services.js | 132 +++----
.../main/webapp/js/nf/canvas/nf-custom-ui.js | 16 +-
.../main/webapp/js/nf/canvas/nf-draggable.js | 46 +--
.../src/main/webapp/js/nf/canvas/nf-funnel.js | 49 +--
.../src/main/webapp/js/nf/canvas/nf-go-to.js | 110 +++---
.../src/main/webapp/js/nf/canvas/nf-graph.js | 64 +--
.../js/nf/canvas/nf-label-configuration.js | 20 +-
.../src/main/webapp/js/nf/canvas/nf-label.js | 71 ++--
.../webapp/js/nf/canvas/nf-policy-management.js | 102 ++---
.../js/nf/canvas/nf-port-configuration.js | 22 +-
.../main/webapp/js/nf/canvas/nf-port-details.js | 20 +-
.../src/main/webapp/js/nf/canvas/nf-port.js | 73 ++--
.../nf/canvas/nf-process-group-configuration.js | 36 +-
.../webapp/js/nf/canvas/nf-process-group.js | 91 +++--
.../js/nf/canvas/nf-processor-configuration.js | 62 +--
.../main/webapp/js/nf/canvas/nf-processor.js | 83 ++--
.../webapp/js/nf/canvas/nf-queue-listing.js | 94 ++---
.../nf-remote-process-group-configuration.js | 18 +-
.../canvas/nf-remote-process-group-details.js | 48 +--
.../nf/canvas/nf-remote-process-group-ports.js | 74 ++--
.../js/nf/canvas/nf-remote-process-group.js | 97 ++---
.../webapp/js/nf/canvas/nf-reporting-task.js | 90 ++---
.../main/webapp/js/nf/canvas/nf-selectable.js | 10 +-
.../src/main/webapp/js/nf/canvas/nf-settings.js | 144 +++----
.../src/main/webapp/js/nf/canvas/nf-snippet.js | 42 +-
.../webapp/js/nf/cluster/nf-cluster-table.js | 90 ++---
.../src/main/webapp/js/nf/cluster/nf-cluster.js | 32 +-
.../webapp/js/nf/counters/nf-counters-table.js | 26 +-
.../main/webapp/js/nf/counters/nf-counters.js | 32 +-
.../webapp/js/nf/history/nf-history-model.js | 10 +-
.../webapp/js/nf/history/nf-history-table.js | 62 +--
.../src/main/webapp/js/nf/history/nf-history.js | 34 +-
.../src/main/webapp/js/nf/login/nf-login.js | 22 +-
.../src/main/webapp/js/nf/nf-ajax-setup.js | 10 +-
.../src/main/webapp/js/nf/nf-client.js | 8 +-
.../src/main/webapp/js/nf/nf-common.js | 16 +-
.../main/webapp/js/nf/nf-connection-details.js | 36 +-
.../src/main/webapp/js/nf/nf-error-handler.js | 20 +-
.../main/webapp/js/nf/nf-ng-app-controller.js | 16 +-
.../main/webapp/js/nf/nf-processor-details.js | 76 ++--
.../src/main/webapp/js/nf/nf-shell.js | 22 +-
.../src/main/webapp/js/nf/nf-status-history.js | 72 ++--
.../js/nf/provenance/nf-provenance-lineage.js | 42 +-
.../js/nf/provenance/nf-provenance-table.js | 162 ++++----
.../webapp/js/nf/provenance/nf-provenance.js | 44 +--
.../webapp/js/nf/summary/nf-cluster-search.js | 22 +-
.../webapp/js/nf/summary/nf-summary-table.js | 304 +++++++-------
.../src/main/webapp/js/nf/summary/nf-summary.js | 62 +--
.../js/nf/templates/nf-templates-table.js | 42 +-
.../main/webapp/js/nf/templates/nf-templates.js | 32 +-
.../main/webapp/js/nf/users/nf-users-table.js | 70 ++--
.../src/main/webapp/js/nf/users/nf-users.js | 36 +-
85 files changed, 2738 insertions(+), 2700 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
index 03cca96..25fe57f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
@@ -167,37 +167,37 @@
var dialog = $(this).addClass('dialog cancellable modal');
dialog.css('display', 'none');
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull(dialog.data('nf-dialog'))) {
- nfDialog = dialog.data('nf-dialog');
+ nfDialogData = dialog.data('nf-dialog');
}
// ensure the options have been properly specified
if (isDefinedAndNotNull(options)) {
- $.extend(nfDialog, options);
+ $.extend(nfDialogData, options);
//persist data attribute
- dialog.data('nfDialog', nfDialog);
+ dialog.data('nfDialog', nfDialogData);
}
// determine if dialog needs a header
- if (!isDefinedAndNotNull(nfDialog.header) || nfDialog.header) {
+ if (!isDefinedAndNotNull(nfDialogData.header) || nfDialogData.header) {
var dialogHeaderText = $('<span class="dialog-header-text"></span>');
var dialogHeader = $('<div class="dialog-header"></div>').prepend(dialogHeaderText);
// determine if the specified header text is null
- if (!isBlank(nfDialog.headerText)) {
- dialogHeaderText.text(nfDialog.headerText);
+ if (!isBlank(nfDialogData.headerText)) {
+ dialogHeaderText.text(nfDialogData.headerText);
}
dialog.prepend(dialogHeader);
}
// determine if dialog needs footer/buttons
- if (!isDefinedAndNotNull(nfDialog.footer) || nfDialog.footer) {
+ if (!isDefinedAndNotNull(nfDialogData.footer) || nfDialogData.footer) {
// add the buttons
- addButtons(dialog, nfDialog.buttons);
+ addButtons(dialog, nfDialogData.buttons);
}
});
},
@@ -210,17 +210,17 @@
setCloseHandler: function (handler) {
return this.each(function (index, dialog) {
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull($(this).data('nf-dialog'))) {
- nfDialog = $(dialog).data('nf-dialog');
+ nfDialogData = $(dialog).data('nf-dialog');
}
- if (!isDefinedAndNotNull(nfDialog.handler)){
- nfDialog.handler = {};
+ if (!isDefinedAndNotNull(nfDialogData.handler)){
+ nfDialogData.handler = {};
}
- nfDialog.handler.close = handler;
+ nfDialogData.handler.close = handler;
//persist data attribute
- $(dialog).data('nfDialog', nfDialog);
+ $(dialog).data('nfDialog', nfDialogData);
});
},
@@ -232,17 +232,17 @@
setOpenHandler: function (handler) {
return this.each(function (index, dialog) {
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull($(this).data('nf-dialog'))) {
- nfDialog = $(dialog).data('nf-dialog');
+ nfDialogData = $(dialog).data('nf-dialog');
}
- if (!isDefinedAndNotNull(nfDialog.handler)){
- nfDialog.handler = {};
+ if (!isDefinedAndNotNull(nfDialogData.handler)){
+ nfDialogData.handler = {};
}
- nfDialog.handler.open = handler;
+ nfDialogData.handler.open = handler;
//persist data attribute
- $(dialog).data('nfDialog', nfDialog);
+ $(dialog).data('nfDialog', nfDialogData);
});
},
@@ -254,17 +254,17 @@
setResizeHandler: function (handler) {
return this.each(function (index, dialog) {
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull($(this).data('nf-dialog'))) {
- nfDialog = $(dialog).data('nf-dialog');
+ nfDialogData = $(dialog).data('nf-dialog');
}
- if (!isDefinedAndNotNull(nfDialog.handler)){
- nfDialog.handler = {};
+ if (!isDefinedAndNotNull(nfDialogData.handler)){
+ nfDialogData.handler = {};
}
- nfDialog.handler.resize = handler;
+ nfDialogData.handler.resize = handler;
//persist data attribute
- $(dialog).data('nfDialog', nfDialog);
+ $(dialog).data('nfDialog', nfDialogData);
});
},
@@ -318,147 +318,147 @@
var dialog = $(this);
var dialogContent = dialog.find('.dialog-content');
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull(dialog.data('nf-dialog'))) {
- nfDialog = dialog.data('nf-dialog');
+ nfDialogData = dialog.data('nf-dialog');
}
//initialize responsive properties
- if (!isDefinedAndNotNull(nfDialog.responsive)) {
- nfDialog.responsive = {};
+ if (!isDefinedAndNotNull(nfDialogData.responsive)) {
+ nfDialogData.responsive = {};
- if (!isDefinedAndNotNull(nfDialog.responsive.x)) {
- nfDialog.responsive.x = true;
+ if (!isDefinedAndNotNull(nfDialogData.responsive.x)) {
+ nfDialogData.responsive.x = true;
}
- if (!isDefinedAndNotNull(nfDialog.responsive.y)) {
- nfDialog.responsive.y = true;
+ if (!isDefinedAndNotNull(nfDialogData.responsive.y)) {
+ nfDialogData.responsive.y = true;
}
} else {
- if (!isDefinedAndNotNull(nfDialog.responsive.x)) {
- nfDialog.responsive.x = true;
+ if (!isDefinedAndNotNull(nfDialogData.responsive.x)) {
+ nfDialogData.responsive.x = true;
} else {
- nfDialog.responsive.x = (nfDialog.responsive.x == "true" || nfDialog.responsive.x == true) ? true : false;
+ nfDialogData.responsive.x = (nfDialogData.responsive.x == "true" || nfDialogData.responsive.x == true) ? true : false;
}
- if (!isDefinedAndNotNull(nfDialog.responsive.y)) {
- nfDialog.responsive.y = true;
+ if (!isDefinedAndNotNull(nfDialogData.responsive.y)) {
+ nfDialogData.responsive.y = true;
} else {
- nfDialog.responsive.y = (nfDialog.responsive.y == "true" || nfDialog.responsive.y == true) ? true : false;
+ nfDialogData.responsive.y = (nfDialogData.responsive.y == "true" || nfDialogData.responsive.y == true) ? true : false;
}
}
- if (nfDialog.responsive.y || nfDialog.responsive.x) {
+ if (nfDialogData.responsive.y || nfDialogData.responsive.x) {
var fullscreenHeight;
var fullscreenWidth;
- if (isDefinedAndNotNull(nfDialog.responsive['fullscreen-height'])) {
- fullscreenHeight = parseInt(nfDialog.responsive['fullscreen-height'], 10);
+ if (isDefinedAndNotNull(nfDialogData.responsive['fullscreen-height'])) {
+ fullscreenHeight = parseInt(nfDialogData.responsive['fullscreen-height'], 10);
} else {
- nfDialog.responsive['fullscreen-height'] = dialog.height() + 'px';
+ nfDialogData.responsive['fullscreen-height'] = dialog.height() + 'px';
- fullscreenHeight = parseInt(nfDialog.responsive['fullscreen-height'], 10);
+ fullscreenHeight = parseInt(nfDialogData.responsive['fullscreen-height'], 10);
}
- if (isDefinedAndNotNull(nfDialog.responsive['fullscreen-width'])) {
- fullscreenWidth = parseInt(nfDialog.responsive['fullscreen-width'], 10);
+ if (isDefinedAndNotNull(nfDialogData.responsive['fullscreen-width'])) {
+ fullscreenWidth = parseInt(nfDialogData.responsive['fullscreen-width'], 10);
} else {
- nfDialog.responsive['fullscreen-width'] = dialog.width() + 'px';
+ nfDialogData.responsive['fullscreen-width'] = dialog.width() + 'px';
- fullscreenWidth = parseInt(nfDialog.responsive['fullscreen-width'], 10);
+ fullscreenWidth = parseInt(nfDialogData.responsive['fullscreen-width'], 10);
}
- if (!isDefinedAndNotNull(nfDialog.width)) {
- nfDialog.width = dialog.css('width');
+ if (!isDefinedAndNotNull(nfDialogData.width)) {
+ nfDialogData.width = dialog.css('width');
}
- if (!isDefinedAndNotNull(nfDialog['min-width'])) {
+ if (!isDefinedAndNotNull(nfDialogData['min-width'])) {
if (parseInt(dialog.css('min-width'), 10) > 0) {
- nfDialog['min-width'] = dialog.css('min-width');
+ nfDialogData['min-width'] = dialog.css('min-width');
} else {
- nfDialog['min-width'] = nfDialog.width;
+ nfDialogData['min-width'] = nfDialogData.width;
}
}
//min-width should always be set in terms of px
- if (nfDialog['min-width'].indexOf("%") > 0) {
- nfDialog['min-width'] = ($(window).width() * (parseInt(nfDialog['min-width'], 10) / 100)) + 'px';
+ if (nfDialogData['min-width'].indexOf("%") > 0) {
+ nfDialogData['min-width'] = ($(window).width() * (parseInt(nfDialogData['min-width'], 10) / 100)) + 'px';
}
- if (!isDefinedAndNotNull(nfDialog.height)) {
- nfDialog.height = dialog.css('height');
+ if (!isDefinedAndNotNull(nfDialogData.height)) {
+ nfDialogData.height = dialog.css('height');
}
- if (!isDefinedAndNotNull(nfDialog['min-height'])) {
+ if (!isDefinedAndNotNull(nfDialogData['min-height'])) {
if (parseInt(dialog.css('min-height'), 10) > 0) {
- nfDialog['min-height'] = dialog.css('min-height');
+ nfDialogData['min-height'] = dialog.css('min-height');
} else {
- nfDialog['min-height'] = nfDialog.height;
+ nfDialogData['min-height'] = nfDialogData.height;
}
}
//min-height should always be set in terms of px
- if (nfDialog['min-height'].indexOf("%") > 0) {
- nfDialog['min-height'] = ($(window).height() * (parseInt(nfDialog['min-height'], 10) / 100)) + 'px';
+ if (nfDialogData['min-height'].indexOf("%") > 0) {
+ nfDialogData['min-height'] = ($(window).height() * (parseInt(nfDialogData['min-height'], 10) / 100)) + 'px';
}
//resize dialog
if ($(window).height() < fullscreenHeight) {
- if (nfDialog.responsive.y) {
+ if (nfDialogData.responsive.y) {
dialog.css('height', '100%');
dialog.css('min-height', '100%');
}
} else {
//set the dialog min-height
- dialog.css('min-height', nfDialog['min-height']);
- if (nfDialog.responsive.y) {
- //make sure nfDialog.height is in terms of %
- if (nfDialog.height.indexOf("px") > 0) {
- nfDialog.height = (parseInt(nfDialog.height, 10) / $(window).height() * 100) + '%';
+ dialog.css('min-height', nfDialogData['min-height']);
+ if (nfDialogData.responsive.y) {
+ //make sure nfDialogData.height is in terms of %
+ if (nfDialogData.height.indexOf("px") > 0) {
+ nfDialogData.height = (parseInt(nfDialogData.height, 10) / $(window).height() * 100) + '%';
}
- dialog.css('height', nfDialog.height);
+ dialog.css('height', nfDialogData.height);
}
}
if ($(window).width() < fullscreenWidth) {
- if (nfDialog.responsive.x) {
+ if (nfDialogData.responsive.x) {
dialog.css('width', '100%');
dialog.css('min-width', '100%');
}
} else {
//set the dialog width
- dialog.css('min-width', nfDialog['min-width']);
- if (nfDialog.responsive.x) {
- //make sure nfDialog.width is in terms of %
- if (nfDialog.width.indexOf("px") > 0) {
- nfDialog.width = (parseInt(nfDialog.width, 10) / $(window).width() * 100) + '%';
+ dialog.css('min-width', nfDialogData['min-width']);
+ if (nfDialogData.responsive.x) {
+ //make sure nfDialogData.width is in terms of %
+ if (nfDialogData.width.indexOf("px") > 0) {
+ nfDialogData.width = (parseInt(nfDialogData.width, 10) / $(window).width() * 100) + '%';
}
- dialog.css('width', nfDialog.width);
+ dialog.css('width', nfDialogData.width);
}
}
dialog.center();
//persist data attribute
- dialog.data('nfDialog', nfDialog);
+ dialog.data('nfDialog', nfDialogData);
}
//apply scrollable style if applicable
if (dialogContent[0].offsetHeight < dialogContent[0].scrollHeight) {
// your element has overflow
- if (isDefinedAndNotNull(nfDialog.scrollableContentStyle)) {
- dialogContent.addClass(nfDialog.scrollableContentStyle);
+ if (isDefinedAndNotNull(nfDialogData.scrollableContentStyle)) {
+ dialogContent.addClass(nfDialogData.scrollableContentStyle);
}
} else {
// your element doesn't have overflow
- if (isDefinedAndNotNull(nfDialog.scrollableContentStyle)) {
- dialogContent.removeClass(nfDialog.scrollableContentStyle);
+ if (isDefinedAndNotNull(nfDialogData.scrollableContentStyle)) {
+ dialogContent.removeClass(nfDialogData.scrollableContentStyle);
}
}
- if (isDefinedAndNotNull(nfDialog.handler)) {
- var handler = nfDialog.handler.resize;
+ if (isDefinedAndNotNull(nfDialogData.handler)) {
+ var handler = nfDialogData.handler.resize;
if (isDefinedAndNotNull(handler) && typeof handler === 'function') {
// invoke the handler
handler.call(dialog);
@@ -492,20 +492,20 @@
}
dialog.css('z-index', zIndex);
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull(dialog.data('nf-dialog'))) {
- nfDialog = dialog.data('nf-dialog');
+ nfDialogData = dialog.data('nf-dialog');
}
var glasspane;
- if (isDefinedAndNotNull(nfDialog.glasspane)) {
- glasspane = nfDialog.glasspane;
+ if (isDefinedAndNotNull(nfDialogData.glasspane)) {
+ glasspane = nfDialogData.glasspane;
} else {
- nfDialog.glasspane = glasspane = dialog.find('.dialog-header').css('background-color'); //default to header color
+ nfDialogData.glasspane = glasspane = dialog.find('.dialog-header').css('background-color'); //default to header color
}
- if(top !== window || !isDefinedAndNotNull(nfDialog.glasspane)) {
- nfDialog.glasspane = glasspane = 'transparent';
+ if(top !== window || !isDefinedAndNotNull(nfDialogData.glasspane)) {
+ nfDialogData.glasspane = glasspane = 'transparent';
}
if (!$('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").is(':visible')) {
@@ -517,7 +517,7 @@
}
//persist data attribute
- dialog.data('nfDialog', nfDialog);
+ dialog.data('nfDialog', nfDialogData);
return this.each(function () {
// show the dialog
@@ -526,8 +526,8 @@
dialog.modal('resize');
dialog.center();
- if (isDefinedAndNotNull(nfDialog.handler)) {
- var handler = nfDialog.handler.open;
+ if (isDefinedAndNotNull(nfDialogData.handler)) {
+ var handler = nfDialogData.handler.open;
if (isDefinedAndNotNull(handler) && typeof handler === 'function') {
// invoke the handler
handler.call(dialog);
@@ -544,13 +544,13 @@
return this.each(function () {
var dialog = $(this);
- var nfDialog = {};
+ var nfDialogData = {};
if (isDefinedAndNotNull(dialog.data('nf-dialog'))) {
- nfDialog = dialog.data('nf-dialog');
+ nfDialogData = dialog.data('nf-dialog');
}
- if (isDefinedAndNotNull(nfDialog.handler)) {
- var handler = nfDialog.handler.close;
+ if (isDefinedAndNotNull(nfDialogData.handler)) {
+ var handler = nfDialogData.handler.close;
if (isDefinedAndNotNull(handler) && typeof handler === 'function') {
// invoke the handler
handler.call(dialog);
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
index ba673a4..8a00257 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/jquery.nfeditor.js
@@ -22,8 +22,8 @@
define(['jquery',
'CodeMirror',
'nf'],
- function ($, common) {
- factory($, common);
+ function ($, CodeMirror, nf) {
+ factory($, CodeMirror, nf);
});
} else if (typeof exports === 'object' && typeof module === 'object') {
factory(require('jquery'),
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
----------------------------------------------------------------------
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 dacd8a0..5e298ae 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
@@ -32,22 +32,22 @@
'nf.Settings'],
function ($,
Slick,
- common,
- universalCapture,
- dialog,
- client,
- errorHandler,
- processGroupConfiguration,
- settings) {
+ nfCommon,
+ nfUniversalCapture,
+ nfDialog,
+ nfClient,
+ nfErrorHandler,
+ nfProcessGroupConfiguration,
+ nfSettings) {
factory($,
Slick,
- common,
- universalCapture,
- dialog,
- client,
- errorHandler,
- processGroupConfiguration,
- settings);
+ nfCommon,
+ nfUniversalCapture,
+ nfDialog,
+ nfClient,
+ nfErrorHandler,
+ nfProcessGroupConfiguration,
+ nfSettings);
});
} else if (typeof exports === 'object' && typeof module === 'object') {
factory(require('jquery'),
@@ -72,13 +72,13 @@
}
}(this, function ($,
Slick,
- common,
- universalCapture,
- dialog,
- client,
- errorHandler,
- processGroupConfiguration,
- settings) {
+ nfCommon,
+ nfUniversalCapture,
+ nfDialog,
+ nfClient,
+ nfErrorHandler,
+ nfProcessGroupConfiguration,
+ nfSettings) {
var languageId = 'nfel';
var editorClass = languageId + '-editor';
@@ -124,7 +124,8 @@
'width': args.position.width + 'px',
'min-width': '212px',
'margin-bottom': '5px',
- 'margin-top': '10px'
+ 'margin-top': '10px',
+ 'white-space': 'pre'
}).tab().on('keydown', scope.handleKeyDown).appendTo(wrapper);
wrapper.draggable({
@@ -219,12 +220,12 @@
this.loadValue = function (item) {
// determine if this is a sensitive property
var isEmptyChecked = false;
- var sensitive = common.isSensitiveProperty(propertyDescriptor);
+ var sensitive = nfCommon.isSensitiveProperty(propertyDescriptor);
// determine the value to use when populating the text field
- if (common.isDefinedAndNotNull(item[args.column.field])) {
+ if (nfCommon.isDefinedAndNotNull(item[args.column.field])) {
if (sensitive) {
- initialValue = common.config.sensitiveText;
+ initialValue = nfCommon.config.sensitiveText;
} else {
initialValue = item[args.column.field];
isEmptyChecked = initialValue === '';
@@ -241,7 +242,7 @@
var sensitiveInput = $(this);
if (sensitiveInput.hasClass('sensitive')) {
sensitiveInput.removeClass('sensitive');
- if (sensitiveInput.val() === common.config.sensitiveText) {
+ if (sensitiveInput.val() === nfCommon.config.sensitiveText) {
sensitiveInput.val('');
}
}
@@ -260,8 +261,8 @@
return '';
} else {
// otherwise if the property is required
- if (common.isRequiredProperty(propertyDescriptor)) {
- if (common.isBlank(propertyDescriptor.defaultValue)) {
+ if (nfCommon.isRequiredProperty(propertyDescriptor)) {
+ if (nfCommon.isBlank(propertyDescriptor.defaultValue)) {
return previousValue;
} else {
return propertyDescriptor.defaultValue;
@@ -322,7 +323,7 @@
propertyDescriptor = descriptors[args.item.property];
// determine if this is a sensitive property
- var sensitive = common.isSensitiveProperty(propertyDescriptor);
+ var sensitive = nfCommon.isSensitiveProperty(propertyDescriptor);
// record the previous value
previousValue = args.item[args.column.field];
@@ -439,12 +440,12 @@
this.loadValue = function (item) {
// determine if this is a sensitive property
var isEmptyChecked = false;
- var sensitive = common.isSensitiveProperty(propertyDescriptor);
+ var sensitive = nfCommon.isSensitiveProperty(propertyDescriptor);
// determine the value to use when populating the text field
- if (common.isDefinedAndNotNull(item[args.column.field])) {
+ if (nfCommon.isDefinedAndNotNull(item[args.column.field])) {
if (sensitive) {
- initialValue = common.config.sensitiveText;
+ initialValue = nfCommon.config.sensitiveText;
} else {
initialValue = item[args.column.field];
isEmptyChecked = initialValue === '';
@@ -468,8 +469,8 @@
return '';
} else {
// otherwise if the property is required
- if (common.isRequiredProperty(propertyDescriptor)) {
- if (common.isBlank(propertyDescriptor.defaultValue)) {
+ if (nfCommon.isRequiredProperty(propertyDescriptor)) {
+ if (nfCommon.isBlank(propertyDescriptor.defaultValue)) {
return previousValue;
} else {
return propertyDescriptor.defaultValue;
@@ -553,7 +554,7 @@
}).appendTo(container);
// check for allowable values which will drive which editor to use
- var allowableValues = common.getAllowableValues(propertyDescriptor);
+ var allowableValues = nfCommon.getAllowableValues(propertyDescriptor);
// show the output port options
var options = [];
@@ -571,7 +572,7 @@
text: allowableValue.displayName,
value: allowableValue.value,
disabled: allowableValueEntity.canRead === false && allowableValue.value !== args.item['previousValue'],
- description: common.escapeHtml(allowableValue.description)
+ description: nfCommon.escapeHtml(allowableValue.description)
});
});
}
@@ -587,7 +588,7 @@
}
// if this descriptor identifies a controller service, provide a way to create one
- if (common.isDefinedAndNotNull(propertyDescriptor.identifiesControllerService)) {
+ if (nfCommon.isDefinedAndNotNull(propertyDescriptor.identifiesControllerService)) {
options.push({
text: 'Create new service...',
value: undefined,
@@ -685,13 +686,13 @@
this.loadValue = function (item) {
// select as appropriate
- if (!common.isUndefined(item.value)) {
+ if (!nfCommon.isUndefined(item.value)) {
initialValue = item.value;
combo.combo('setSelectedOption', {
value: item.value
});
- } else if (common.isDefinedAndNotNull(propertyDescriptor.defaultValue)) {
+ } else if (nfCommon.isDefinedAndNotNull(propertyDescriptor.defaultValue)) {
initialValue = propertyDescriptor.defaultValue;
combo.combo('setSelectedOption', {
@@ -735,20 +736,20 @@
*/
var showPropertyValue = function (propertyGrid, descriptors, row, cell) {
// remove any currently open detail dialogs
- universalCapture.removeAllPropertyDetailDialogs();
+ nfUniversalCapture.removeAllPropertyDetailDialogs();
// get the property in question
var propertyData = propertyGrid.getData();
var property = propertyData.getItem(row);
// ensure there is a value
- if (common.isDefinedAndNotNull(property.value)) {
+ if (nfCommon.isDefinedAndNotNull(property.value)) {
// get the descriptor to insert the description tooltip
var propertyDescriptor = descriptors[property.property];
// ensure we're not dealing with a sensitive property
- if (!common.isSensitiveProperty(propertyDescriptor)) {
+ if (!nfCommon.isSensitiveProperty(propertyDescriptor)) {
// get details about the location of the cell
var cellNode = $(propertyGrid.getCellNode(row, cell));
@@ -769,7 +770,7 @@
'left': offset.left - 20
}).appendTo('body');
- var allowableValues = common.getAllowableValues(propertyDescriptor);
+ var allowableValues = nfCommon.getAllowableValues(propertyDescriptor);
if ($.isArray(allowableValues)) {
// prevent dragging over the combo
wrapper.draggable({
@@ -784,7 +785,7 @@
options.push({
text: allowableValue.displayName,
value: allowableValue.value,
- description: common.escapeHtml(allowableValue.description),
+ description: nfCommon.escapeHtml(allowableValue.description),
disabled: true
});
});
@@ -833,7 +834,7 @@
var editor = null;
// so the nfel editor is appropriate
- if (common.supportsEl(propertyDescriptor)) {
+ if (nfCommon.supportsEl(propertyDescriptor)) {
var languageId = 'nfel';
var editorClass = languageId + '-editor';
@@ -957,15 +958,15 @@
var options = [];
$.each(response.controllerServiceTypes, function (i, controllerServiceType) {
options.push({
- text: common.substringAfterLast(controllerServiceType.type, '.'),
+ text: nfCommon.substringAfterLast(controllerServiceType.type, '.'),
value: controllerServiceType.type,
- description: common.escapeHtml(controllerServiceType.description)
+ description: nfCommon.escapeHtml(controllerServiceType.description)
});
});
// ensure there are some applicable controller services
if (options.length === 0) {
- dialog.showOkDialog({
+ nfDialog.showOkDialog({
headerText: 'Controller Service',
dialogContent: 'No controller service types found that are applicable for this property.'
});
@@ -1053,7 +1054,7 @@
// build the controller service entity
var controllerServiceEntity = {
- 'revision': client.getRevision({
+ 'revision': nfClient.getRevision({
'revision': {
'version': 0,
}
@@ -1065,7 +1066,7 @@
// determine the appropriate uri for creating the controller service
var uri = '../nifi-api/controller/controller-services';
- if (common.isDefinedAndNotNull(groupId)) {
+ if (nfCommon.isDefinedAndNotNull(groupId)) {
uri = '../nifi-api/process-groups/' + encodeURIComponent(groupId) + '/controller-services';
}
@@ -1083,7 +1084,7 @@
// store the descriptor for use later
var descriptors = gridContainer.data('descriptors');
- if (!common.isUndefined(descriptors)) {
+ if (!nfCommon.isUndefined(descriptors)) {
descriptors[descriptor.name] = descriptor;
}
@@ -1101,7 +1102,7 @@
if (typeof configurationOptions.controllerServiceCreatedDeferred === 'function') {
configurationOptions.controllerServiceCreatedDeferred(response);
}
- }).fail(errorHandler.handleAjaxError);
+ }).fail(nfErrorHandler.handleAjaxError);
};
var cancel = function () {
@@ -1110,7 +1111,7 @@
newControllerServiceDialog.modal('show');
}
- }).fail(errorHandler.handleAjaxError);
+ }).fail(nfErrorHandler.handleAjaxError);
};
var initPropertiesTable = function (table, options) {
@@ -1130,8 +1131,8 @@
var propertyDescriptor = descriptors[dataContext.property];
// show the property description if applicable
- if (common.isDefinedAndNotNull(propertyDescriptor)) {
- if (!common.isBlank(propertyDescriptor.description) || !common.isBlank(propertyDescriptor.defaultValue) || !common.isBlank(propertyDescriptor.supportsEl)) {
+ if (nfCommon.isDefinedAndNotNull(propertyDescriptor)) {
+ if (!nfCommon.isBlank(propertyDescriptor.description) || !nfCommon.isBlank(propertyDescriptor.defaultValue) || !nfCommon.isBlank(propertyDescriptor.supportsEl)) {
$('<div class="fa fa-question-circle" alt="Info" style="float: right; margin-right: 6px; margin-top: 4px;"></div>').appendTo(cellContent);
$('<span class="hidden property-descriptor-name"></span>').text(dataContext.property).appendTo(cellContent);
nameWidthOffset = 46; // 10 + icon width (10) + icon margin (6) + padding (20)
@@ -1148,17 +1149,17 @@
// function for formatting the property value
var valueFormatter = function (row, cell, value, columnDef, dataContext) {
var valueMarkup;
- if (common.isDefinedAndNotNull(value)) {
+ if (nfCommon.isDefinedAndNotNull(value)) {
// get the property descriptor
var descriptors = table.data('descriptors');
var propertyDescriptor = descriptors[dataContext.property];
// determine if the property is sensitive
- if (common.isSensitiveProperty(propertyDescriptor)) {
+ if (nfCommon.isSensitiveProperty(propertyDescriptor)) {
valueMarkup = '<span class="table-cell sensitive">Sensitive value set</span>';
} else {
// if there are allowable values, attempt to swap out for the display name
- var allowableValues = common.getAllowableValues(propertyDescriptor);
+ var allowableValues = nfCommon.getAllowableValues(propertyDescriptor);
if ($.isArray(allowableValues)) {
$.each(allowableValues, function (_, allowableValueEntity) {
var allowableValue = allowableValueEntity.allowableValue;
@@ -1172,7 +1173,7 @@
if (value === '') {
valueMarkup = '<span class="table-cell blank">Empty string set</span>';
} else {
- valueMarkup = '<div class="table-cell value"><pre class="ellipsis">' + common.escapeHtml(value) + '</pre></div>';
+ valueMarkup = '<div class="table-cell value"><pre class="ellipsis">' + nfCommon.escapeHtml(value) + '</pre></div>';
}
}
} else {
@@ -1220,8 +1221,8 @@
var descriptors = table.data('descriptors');
var propertyDescriptor = descriptors[dataContext.property];
- var identifiesControllerService = common.isDefinedAndNotNull(propertyDescriptor.identifiesControllerService);
- var isConfigured = common.isDefinedAndNotNull(dataContext.value);
+ var identifiesControllerService = nfCommon.isDefinedAndNotNull(propertyDescriptor.identifiesControllerService);
+ var isConfigured = nfCommon.isDefinedAndNotNull(dataContext.value);
// check to see if we should provide a button for going to a controller service
if (identifiesControllerService && isConfigured && (options.supportsGoTo === true)) {
@@ -1273,7 +1274,7 @@
var propertyDescriptor = descriptors[item.property];
// support el if specified or unsure yet (likely a dynamic property)
- if (common.isUndefinedOrNull(propertyDescriptor) || common.supportsEl(propertyDescriptor)) {
+ if (nfCommon.isUndefinedOrNull(propertyDescriptor) || nfCommon.supportsEl(propertyDescriptor)) {
return {
columns: {
value: {
@@ -1283,7 +1284,7 @@
};
} else {
// check for allowable values which will drive which editor to use
- var allowableValues = common.getAllowableValues(propertyDescriptor);
+ var allowableValues = nfCommon.getAllowableValues(propertyDescriptor);
if ($.isArray(allowableValues)) {
return {
columns: {
@@ -1320,37 +1321,37 @@
var controllerService = controllerServiceEntity.component;
$.Deferred(function (deferred) {
- if (common.isDefinedAndNotNull(controllerService.parentGroupId)) {
+ if (nfCommon.isDefinedAndNotNull(controllerService.parentGroupId)) {
if ($('#process-group-configuration').is(':visible')) {
- processGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function () {
+ nfProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function () {
deferred.resolve();
});
} else {
- processGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
+ nfProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
deferred.resolve();
});
}
} else {
if ($('#settings').is(':visible')) {
// reload the settings
- settings.loadSettings().done(function () {
+ nfSettings.loadSettings().done(function () {
deferred.resolve();
});
} else {
// reload the settings and show
- settings.showSettings().done(function () {
+ nfSettings.showSettings().done(function () {
deferred.resolve();
});
}
}
}).done(function () {
- if (common.isDefinedAndNotNull(controllerService.parentGroupId)) {
- processGroupConfiguration.selectControllerService(property.value);
+ if (nfCommon.isDefinedAndNotNull(controllerService.parentGroupId)) {
+ nfProcessGroupConfiguration.selectControllerService(property.value);
} else {
- settings.selectControllerService(property.value);
+ nfSettings.selectControllerService(property.value);
}
});
- }).fail(errorHandler.handleAjaxError);
+ }).fail(nfErrorHandler.handleAjaxError);
};
// initialize the grid
@@ -1433,11 +1434,11 @@
var propertyHistory = history[property];
// format the tooltip
- var tooltip = common.formatPropertyTooltip(propertyDescriptor, propertyHistory);
+ var tooltip = nfCommon.formatPropertyTooltip(propertyDescriptor, propertyHistory);
- if (common.isDefinedAndNotNull(tooltip)) {
+ if (nfCommon.isDefinedAndNotNull(tooltip)) {
infoIcon.qtip($.extend({},
- common.config.tooltipConfig,
+ nfCommon.config.tooltipConfig,
{
content: tooltip
}));
@@ -1449,7 +1450,7 @@
var saveRow = function (table) {
// get the property grid to commit the current edit
var propertyGrid = table.data('gridInstance');
- if (common.isDefinedAndNotNull(propertyGrid)) {
+ if (nfCommon.isDefinedAndNotNull(propertyGrid)) {
var editController = propertyGrid.getEditController();
editController.commitCurrentEdit();
}
@@ -1486,7 +1487,7 @@
var propertyData = propertyGrid.getData();
// generate the properties
- if (common.isDefinedAndNotNull(properties)) {
+ if (nfCommon.isDefinedAndNotNull(properties)) {
propertyData.beginUpdate();
var i = 0;
@@ -1497,10 +1498,10 @@
// determine the property type
var type = 'userDefined';
var displayName = name;
- if (common.isDefinedAndNotNull(descriptor)) {
- if (common.isRequiredProperty(descriptor)) {
+ if (nfCommon.isDefinedAndNotNull(descriptor)) {
+ if (nfCommon.isRequiredProperty(descriptor)) {
type = 'required';
- } else if (common.isDynamicProperty(descriptor)) {
+ } else if (nfCommon.isDynamicProperty(descriptor)) {
type = 'userDefined';
} else {
type = 'optional';
@@ -1510,7 +1511,7 @@
displayName = descriptor.displayName;
// determine the value
- if (common.isNull(value) && common.isDefinedAndNotNull(descriptor.defaultValue)) {
+ if (nfCommon.isNull(value) && nfCommon.isDefinedAndNotNull(descriptor.defaultValue)) {
value = descriptor.defaultValue;
}
}
@@ -1539,10 +1540,10 @@
var clear = function (propertyTableContainer) {
var options = propertyTableContainer.data('options');
if (options.readOnly === true) {
- universalCapture.removeAllPropertyDetailDialogs();
+ nfUniversalCapture.removeAllPropertyDetailDialogs();
} else {
// clear any existing new property dialogs
- if (common.isDefinedAndNotNull(options.dialogContainer)) {
+ if (nfCommon.isDefinedAndNotNull(options.dialogContainer)) {
$('#new-property-dialog').modal("hide");
}
}
@@ -1552,7 +1553,7 @@
table.removeData('descriptors history');
// clean up any tooltips that may have been generated
- common.cleanUpTooltips(table, 'div.fa-question-circle');
+ nfCommon.cleanUpTooltips(table, 'div.fa-question-circle');
// clear the data in the grid
var propertyGrid = table.data('gridInstance');
@@ -1586,7 +1587,7 @@
init: function (options) {
return this.each(function () {
// ensure the options have been properly specified
- if (common.isDefinedAndNotNull(options)) {
+ if (nfCommon.isDefinedAndNotNull(options)) {
// get the tag cloud
var propertyTableContainer = $(this);
@@ -1601,7 +1602,7 @@
var table = $('<div class="property-table"></div>').appendTo(propertyTableContainer);
// optionally add a add new property button
- if (options.readOnly !== true && common.isDefinedAndNotNull(options.dialogContainer)) {
+ if (options.readOnly !== true && nfCommon.isDefinedAndNotNull(options.dialogContainer)) {
// build the new property dialog
var newPropertyDialogMarkup =
'<div id="new-property-dialog" class="dialog cancellable small-dialog hidden">' +
@@ -1673,7 +1674,7 @@
// store the descriptor for use later
var descriptors = table.data('descriptors');
- if (!common.isUndefined(descriptors)) {
+ if (!nfCommon.isUndefined(descriptors)) {
descriptors[descriptor.name] = descriptor;
}
@@ -1708,7 +1709,7 @@
propertyGrid.setActiveCell(row, propertyGrid.getColumnIndex('value'));
propertyGrid.editActiveCell();
} else {
- dialog.showOkDialog({
+ nfDialog.showOkDialog({
headerText: 'Property Exists',
dialogContent: 'A property with this name already exists.'
});
@@ -1720,7 +1721,7 @@
}
}
} else {
- dialog.showOkDialog({
+ nfDialog.showOkDialog({
headerText: 'Property Name',
dialogContent: 'Property name must be specified.'
});
@@ -1803,7 +1804,7 @@
return this.each(function () {
var table = $(this).find('div.property-table');
var propertyGrid = table.data('gridInstance');
- if (common.isDefinedAndNotNull(propertyGrid)) {
+ if (nfCommon.isDefinedAndNotNull(propertyGrid)) {
propertyGrid.resizeCanvas();
}
});
@@ -1816,7 +1817,7 @@
return this.each(function () {
var table = $(this).find('div.property-table');
var propertyGrid = table.data('gridInstance');
- if (common.isDefinedAndNotNull(propertyGrid)) {
+ if (nfCommon.isDefinedAndNotNull(propertyGrid)) {
var editController = propertyGrid.getEditController();
editController.cancelCurrentEdit();
}
@@ -1831,12 +1832,12 @@
var propertyTableContainer = $(this);
var options = propertyTableContainer.data('options');
- if (common.isDefinedAndNotNull(options)) {
+ if (nfCommon.isDefinedAndNotNull(options)) {
// clear the property table container
clear(propertyTableContainer);
// clear any existing new property dialogs
- if (common.isDefinedAndNotNull(options.dialogContainer)) {
+ if (nfCommon.isDefinedAndNotNull(options.dialogContainer)) {
$('#new-property-dialog').modal("hide");
$(options.dialogContainer).children('div.new-inline-controller-service-dialog').remove();
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index b563a51..ea9f40d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -30,23 +30,23 @@
'nf.Storage'],
function ($,
angular,
- common,
+ nfCommon,
appConfig,
appCtrl,
serviceProvider,
- angularBridge,
- errorHandler,
- storage) {
+ nfNgBridge,
+ nfErrorHandler,
+ nfStorage) {
return (nf.ng.BulletinBoardCtrl =
factory($,
angular,
- common,
+ nfCommon,
appConfig,
appCtrl,
serviceProvider,
- angularBridge,
- errorHandler,
- storage));
+ nfNgBridge,
+ nfErrorHandler,
+ nfStorage));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ng.BulletinBoardCtrl =
@@ -70,7 +70,7 @@
root.nf.ErrorHandler,
root.nf.Storage);
}
-}(this, function ($, angular, common, appConfig, appCtrl, serviceProvider, angularBridge, errorHandler, storage) {
+}(this, function ($, angular, nfCommon, appConfig, appCtrl, serviceProvider, nfNgBridge, nfErrorHandler, nfStorage) {
'use strict';
$(document).ready(function () {
@@ -95,10 +95,10 @@
app.service('bulletinBoardCtrl', nfBulletinBoard);
//Manually Boostrap Angular App
- angularBridge.injector = angular.bootstrap($('body'), ['ngBulletinBoardApp'], {strictDi: true});
+ nfNgBridge.injector = angular.bootstrap($('body'), ['ngBulletinBoardApp'], {strictDi: true});
// initialize the bulletin board
- angularBridge.injector.get('bulletinBoardCtrl').init();
+ nfNgBridge.injector.get('bulletinBoardCtrl').init();
});
var nfBulletinBoard = function (serviceProvider) {
@@ -158,7 +158,7 @@
// set the document title and the about title
document.title = bulletinBoardTitle;
$('#bulletin-board-header-text').text(bulletinBoardTitle);
- }).fail(errorHandler.handleAjaxError);
+ }).fail(nfErrorHandler.handleAjaxError);
// get the banners if we're not in the shell
var loadBanners = $.Deferred(function (deferred) {
@@ -169,8 +169,8 @@
dataType: 'json'
}).done(function (response) {
// ensure the banners response is specified
- if (common.isDefinedAndNotNull(response.banners)) {
- if (common.isDefinedAndNotNull(response.banners.headerText) && response.banners.headerText !== '') {
+ if (nfCommon.isDefinedAndNotNull(response.banners)) {
+ if (nfCommon.isDefinedAndNotNull(response.banners.headerText) && response.banners.headerText !== '') {
// update the header text
var bannerHeader = $('#banner-header').text(response.banners.headerText).show();
@@ -184,7 +184,7 @@
updateTop('bulletin-board');
}
- if (common.isDefinedAndNotNull(response.banners.footerText) && response.banners.footerText !== '') {
+ if (nfCommon.isDefinedAndNotNull(response.banners.footerText) && response.banners.footerText !== '') {
// update the footer text and show it
var bannerFooter = $('#banner-footer').text(response.banners.footerText).show();
@@ -200,7 +200,7 @@
deferred.resolve();
}).fail(function (xhr, status, error) {
- errorHandler.handleAjaxError(xhr, status, error);
+ nfErrorHandler.handleAjaxError(xhr, status, error);
deferred.reject();
});
} else {
@@ -286,7 +286,7 @@
// only attempt this if we're within a frame
if (top !== window) {
// and our parent has canvas utils and shell defined
- if (common.isDefinedAndNotNull(parent.nf) && common.isDefinedAndNotNull(parent.nf.CanvasUtils) && common.isDefinedAndNotNull(parent.nf.Shell)) {
+ if (nfCommon.isDefinedAndNotNull(parent.nf) && nfCommon.isDefinedAndNotNull(parent.nf.CanvasUtils) && nfCommon.isDefinedAndNotNull(parent.nf.Shell)) {
parent.nf.CanvasUtils.showComponent(groupId, sourceId);
parent.$('#shell-close-button').click();
}
@@ -333,7 +333,7 @@
});
}
- storage.init();
+ nfStorage.init();
initializePage().done(function () {
start();
@@ -347,7 +347,7 @@
var data = {};
// include the timestamp if appropriate
- if (common.isDefinedAndNotNull(lastBulletin)) {
+ if (nfCommon.isDefinedAndNotNull(lastBulletin)) {
data['after'] = lastBulletin;
} else {
data['limit'] = 10;
@@ -382,7 +382,7 @@
dataType: 'json'
}).done(function (response) {
// ensure the bulletin board was specified
- if (common.isDefinedAndNotNull(response.bulletinBoard)) {
+ if (nfCommon.isDefinedAndNotNull(response.bulletinBoard)) {
var bulletinBoard = response.bulletinBoard;
// update the stats last refreshed timestamp
@@ -407,13 +407,13 @@
// format the source id
var source;
- if (common.isDefinedAndNotNull(bulletin.sourceId) && common.isDefinedAndNotNull(bulletin.groupId) && top !== window) {
+ if (nfCommon.isDefinedAndNotNull(bulletin.sourceId) && nfCommon.isDefinedAndNotNull(bulletin.groupId) && top !== window) {
source = $('<div class="bulletin-source bulletin-link"></div>').text(bulletin.sourceId).on('click', function () {
goToSource(bulletin.groupId, bulletin.sourceId);
});
} else {
var sourceId = bulletin.sourceId;
- if (common.isUndefined(sourceId) || common.isNull(sourceId)) {
+ if (nfCommon.isUndefined(sourceId) || nfCommon.isNull(sourceId)) {
sourceId = '';
}
source = $('<div class="bulletin-source"></div>').text(sourceId);
@@ -430,7 +430,7 @@
$('<div class="clear"></div>').appendTo(bulletinInfoMarkup);
// format the node address if applicable
- if (common.isDefinedAndNotNull(bulletin.nodeAddress)) {
+ if (nfCommon.isDefinedAndNotNull(bulletin.nodeAddress)) {
$('<div class="bulletin-node"></div>').text(bulletin.nodeAddress).appendTo(bulletinMarkup);
}
@@ -467,7 +467,7 @@
// stop future polling
bulletinBoardCtrl.togglePolling();
} else {
- errorHandler.handleAjaxError(xhr, status, error);
+ nfErrorHandler.handleAjaxError(xhr, status, error);
}
});
},
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js
index c177175..72cd57b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js
@@ -21,8 +21,8 @@
if (typeof define === 'function' && define.amd) {
define(['jquery',
'nf.Common'],
- function ($, common) {
- return (nf.ng.BreadcrumbsCtrl = factory($, common));
+ function ($, nfCommon) {
+ return (nf.ng.BreadcrumbsCtrl = factory($, nfCommon));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ng.BreadcrumbsCtrl =
@@ -32,7 +32,7 @@
nf.ng.BreadcrumbsCtrl = factory(root.$,
root.nf.Common);
}
-}(this, function ($, common) {
+}(this, function ($, nfCommon) {
'use strict';
return function (serviceProvider) {
@@ -69,7 +69,7 @@
'label': label
}, breadcrumbEntity));
- if (common.isDefinedAndNotNull(breadcrumbEntity.parentBreadcrumb)) {
+ if (nfCommon.isDefinedAndNotNull(breadcrumbEntity.parentBreadcrumb)) {
this.generateBreadcrumbs(breadcrumbEntity.parentBreadcrumb);
}
},
@@ -132,7 +132,7 @@
// still having issues with this in IE :/
element.on('DOMMouseScroll mousewheel', function (evt, d) {
- if (common.isUndefinedOrNull(evt.originalEvent)) {
+ if (nfCommon.isUndefinedOrNull(evt.originalEvent)) {
return;
}
@@ -155,9 +155,9 @@
//Chrome and Safari both have evt.originalEvent.detail defined but
//evt.originalEvent.wheelDelta holds the correct value so we must
//check for evt.originalEvent.wheelDelta first!
- if (common.isDefinedAndNotNull(evt.originalEvent.wheelDelta)) {
+ if (nfCommon.isDefinedAndNotNull(evt.originalEvent.wheelDelta)) {
delta = evt.originalEvent.wheelDelta;
- } else if (common.isDefinedAndNotNull(evt.originalEvent.detail)) {
+ } else if (nfCommon.isDefinedAndNotNull(evt.originalEvent.detail)) {
delta = -evt.originalEvent.detail;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/2c374baf/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index 8e2b520..16f40f1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -27,8 +27,8 @@
'nf.ClusterSummary',
'nf.ErrorHandler',
'nf.Settings'],
- function ($, common, dialog, canvasUtils, contextMenu, clusterSummary, errorHandler, settings) {
- return (nf.ng.Canvas.FlowStatusCtrl = factory($, common, dialog, canvasUtils, contextMenu, clusterSummary, errorHandler, settings));
+ function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings) {
+ return (nf.ng.Canvas.FlowStatusCtrl = factory($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.ng.Canvas.FlowStatusCtrl =
@@ -50,7 +50,7 @@
root.nf.ErrorHandler,
root.nf.Settings);
}
-}(this, function ($, common, dialog, canvasUtils, contextMenu, clusterSummary, errorHandler, settings) {
+}(this, function ($, nfCommon, nfDialog, nfCanvasUtils, nfContextMenu, nfClusterSummary, nfErrorHandler, nfSettings) {
'use strict';
return function (serviceProvider) {
@@ -134,7 +134,7 @@
var searchResults = items[0];
// show all processors
- if (!common.isEmpty(searchResults.processorResults)) {
+ if (!nfCommon.isEmpty(searchResults.processorResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-processor"></div>Processors</li>');
$.each(searchResults.processorResults, function (i, processorMatch) {
nfSearchAutocomplete._renderItem(ul, processorMatch);
@@ -142,7 +142,7 @@
}
// show all process groups
- if (!common.isEmpty(searchResults.processGroupResults)) {
+ if (!nfCommon.isEmpty(searchResults.processGroupResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-group"></div>Process Groups</li>');
$.each(searchResults.processGroupResults, function (i, processGroupMatch) {
nfSearchAutocomplete._renderItem(ul, processGroupMatch);
@@ -150,7 +150,7 @@
}
// show all remote process groups
- if (!common.isEmpty(searchResults.remoteProcessGroupResults)) {
+ if (!nfCommon.isEmpty(searchResults.remoteProcessGroupResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-group-remote"></div>Remote Process Groups</li>');
$.each(searchResults.remoteProcessGroupResults, function (i, remoteProcessGroupMatch) {
nfSearchAutocomplete._renderItem(ul, remoteProcessGroupMatch);
@@ -158,7 +158,7 @@
}
// show all connections
- if (!common.isEmpty(searchResults.connectionResults)) {
+ if (!nfCommon.isEmpty(searchResults.connectionResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-connect"></div>Connections</li>');
$.each(searchResults.connectionResults, function (i, connectionMatch) {
nfSearchAutocomplete._renderItem(ul, connectionMatch);
@@ -166,7 +166,7 @@
}
// show all input ports
- if (!common.isEmpty(searchResults.inputPortResults)) {
+ if (!nfCommon.isEmpty(searchResults.inputPortResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-port-in"></div>Input Ports</li>');
$.each(searchResults.inputPortResults, function (i, inputPortMatch) {
nfSearchAutocomplete._renderItem(ul, inputPortMatch);
@@ -174,7 +174,7 @@
}
// show all output ports
- if (!common.isEmpty(searchResults.outputPortResults)) {
+ if (!nfCommon.isEmpty(searchResults.outputPortResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-port-out"></div>Output Ports</li>');
$.each(searchResults.outputPortResults, function (i, outputPortMatch) {
nfSearchAutocomplete._renderItem(ul, outputPortMatch);
@@ -182,7 +182,7 @@
}
// show all funnels
- if (!common.isEmpty(searchResults.funnelResults)) {
+ if (!nfCommon.isEmpty(searchResults.funnelResults)) {
ul.append('<li class="search-header"><div class="search-result-icon icon icon-funnel"></div>Funnels</li>');
$.each(searchResults.funnelResults, function (i, funnelMatch) {
nfSearchAutocomplete._renderItem(ul, funnelMatch);
@@ -228,7 +228,7 @@
var item = ui.item;
// show the selected component
- canvasUtils.showComponent(item.groupId, item.id);
+ nfCanvasUtils.showComponent(item.groupId, item.id);
searchCtrl.getInputElement().val('').blur();
@@ -262,7 +262,7 @@
var searchCtrl = this;
// hide the context menu if necessary
- contextMenu.hide();
+ nfContextMenu.hide();
var isVisible = searchCtrl.getInputElement().is(':visible');
var display = 'none';
@@ -306,11 +306,11 @@
var currentBulletins = bulletinIcon.data('bulletins');
// update the bulletins if necessary
- if (common.doBulletinsDiffer(currentBulletins, response.bulletins)) {
+ if (nfCommon.doBulletinsDiffer(currentBulletins, response.bulletins)) {
bulletinIcon.data('bulletins', response.bulletins);
// get the formatted the bulletins
- var bulletins = common.getFormattedBulletins(response.bulletins);
+ var bulletins = nfCommon.getFormattedBulletins(response.bulletins);
// bulletins for this processor are now gone
if (bulletins.length === 0) {
@@ -318,7 +318,7 @@
bulletinIcon.removeClass('has-bulletins').qtip('api').destroy(true);
}
} else {
- var newBulletins = common.formatUnorderedList(bulletins);
+ var newBulletins = nfCommon.formatUnorderedList(bulletins);
// different bulletins, refresh
if (bulletinIcon.data('qtip')) {
@@ -326,7 +326,7 @@
} else {
// no bulletins before, show icon and tips
bulletinIcon.addClass('has-bulletins').qtip($.extend({},
- canvasUtils.config.systemTooltipConfig,
+ nfCanvasUtils.config.systemTooltipConfig,
{
content: newBulletins,
position: {
@@ -343,7 +343,7 @@
}
// update controller service and reporting task bulletins
- settings.setBulletins(response.controllerServiceBulletins, response.reportingTaskBulletins);
+ nfSettings.setBulletins(response.controllerServiceBulletins, response.reportingTaskBulletins);
}
}
@@ -371,10 +371,10 @@
dataType: 'json'
}).done(function (response) {
// report the updated status
- if (common.isDefinedAndNotNull(response.controllerStatus)) {
+ if (nfCommon.isDefinedAndNotNull(response.controllerStatus)) {
flowStatusCtrl.update(response.controllerStatus);
}
- }).fail(errorHandler.handleAjaxError);
+ }).fail(nfErrorHandler.handleAjaxError);
},
/**
@@ -384,11 +384,11 @@
*/
updateClusterSummary: function (summary) {
// see if this node has been (dis)connected
- if (clusterSummary.isConnectedToCluster() !== summary.connectedToCluster) {
+ if (nfClusterSummary.isConnectedToCluster() !== summary.connectedToCluster) {
if (summary.connectedToCluster) {
- dialog.showConnectedToClusterMessage();
+ nfDialog.showConnectedToClusterMessage();
} else {
- dialog.showDisconnectedFromClusterMessage();
+ nfDialog.showDisconnectedFromClusterMessage();
}
}
@@ -396,7 +396,7 @@
// update the connection state
if (summary.connectedToCluster) {
- if (common.isDefinedAndNotNull(summary.connectedNodes)) {
+ if (nfCommon.isDefinedAndNotNull(summary.connectedNodes)) {
var connectedNodes = summary.connectedNodes.split(' / ');
if (connectedNodes.length === 2 && connectedNodes[0] !== connectedNodes[1]) {
this.clusterConnectionWarning = true;
@@ -404,7 +404,7 @@
}
}
this.connectedNodesCount =
- common.isDefinedAndNotNull(summary.connectedNodes) ? summary.connectedNodes : '-';
+ nfCommon.isDefinedAndNotNull(summary.connectedNodes) ? summary.connectedNodes : '-';
} else {
this.connectedNodesCount = 'Disconnected';
color = '#BA554A';
@@ -420,7 +420,7 @@
* @param status The controller status returned from the `../nifi-api/flow/status` endpoint.
*/
update: function (status) {
- var controllerInvalidCount = (common.isDefinedAndNotNull(status.invalidCount)) ? status.invalidCount : 0;
+ var controllerInvalidCount = (nfCommon.isDefinedAndNotNull(status.invalidCount)) ? status.invalidCount : 0;
if (this.controllerInvalidCount > 0) {
$('#controller-invalid-count').parent().removeClass('zero').addClass('invalid');
@@ -447,7 +447,7 @@
// update the component counts
this.controllerTransmittingCount =
- common.isDefinedAndNotNull(status.activeRemotePortCount) ?
+ nfCommon.isDefinedAndNotNull(status.activeRemotePortCount) ?
status.activeRemotePortCount : '-';
if (this.controllerTransmittingCount > 0) {
@@ -457,7 +457,7 @@
}
this.controllerNotTransmittingCount =
- common.isDefinedAndNotNull(status.inactiveRemotePortCount) ?
+ nfCommon.isDefinedAndNotNull(status.inactiveRemotePortCount) ?
status.inactiveRemotePortCount : '-';
if (this.controllerNotTransmittingCount > 0) {
@@ -467,7 +467,7 @@
}
this.controllerRunningCount =
- common.isDefinedAndNotNull(status.runningCount) ? status.runningCount : '-';
+ nfCommon.isDefinedAndNotNull(status.runningCount) ? status.runningCount : '-';
if (this.controllerRunningCount > 0) {
$('#flow-status-container').find('.fa-play').removeClass('zero').addClass('running');
@@ -476,7 +476,7 @@
}
this.controllerStoppedCount =
- common.isDefinedAndNotNull(status.stoppedCount) ? status.stoppedCount : '-';
+ nfCommon.isDefinedAndNotNull(status.stoppedCount) ? status.stoppedCount : '-';
if (this.controllerStoppedCount > 0) {
$('#flow-status-container').find('.fa-stop').removeClass('zero').addClass('stopped');
@@ -485,7 +485,7 @@
}
this.controllerInvalidCount =
- common.isDefinedAndNotNull(status.invalidCount) ? status.invalidCount : '-';
+ nfCommon.isDefinedAndNotNull(status.invalidCount) ? status.invalidCount : '-';
if (this.controllerInvalidCount > 0) {
$('#flow-status-container').find('.fa-warning').removeClass('zero').addClass('invalid');
@@ -494,7 +494,7 @@
}
this.controllerDisabledCount =
- common.isDefinedAndNotNull(status.disabledCount) ? status.disabledCount : '-';
+ nfCommon.isDefinedAndNotNull(status.disabledCount) ? status.disabledCount : '-';
if (this.controllerDisabledCount > 0) {
$('#flow-status-container').find('.icon-enable-false').removeClass('zero').addClass('disabled');