Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3615: 

- Removing hidden control characters.

This closes #1599

Signed-off-by: Scott Aslan <scottyaslan@gmail.com>
This commit is contained in:
Matt Gilman 2017-03-17 08:15:28 -04:00 committed by Scott Aslan
parent 768e89b579
commit 47c6718fe2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
View File

@ -115,7 +115,7 @@
// refresh all component types as necessary (handle components that have been removed) // refresh all component types as necessary (handle components that have been removed)
componentMap.forEach(function (type, ids) { componentMap.forEach(function (type, ids) {
nfCanvasUtils.getComponentByType(type).remove(ids); nfCanvasUtils.getComponentByType(type).remove(ids);
});

 });
// refresh the birdseye // refresh the birdseye
nfBirdseye.refresh(); nfBirdseye.refresh();

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
View File

@ -1931,7 +1931,7 @@
* *
* @argument {selection} selection The selection * @argument {selection} selection The selection
*/ */
isDisconnected: function (selection) {
 isDisconnected: function (selection) {
// if nothing is selected return // if nothing is selected return
if (selection.empty()) { if (selection.empty()) {
@ -1939,20 +1939,20 @@
} }
var connections = d3.map(); var connections = d3.map();
var components = d3.map(); var components = d3.map();
var isDisconnected = true;

 var isDisconnected = true;
// include connections // include connections
selection.filter(function (d) { selection.filter(function (d) {
return d.type === 'Connection'; return d.type === 'Connection';
}).each(function (d) { }).each(function (d) {
connections.set(d.id, d); connections.set(d.id, d);
});

 });
// include components and ensure their connections are included // include components and ensure their connections are included
selection.filter(function (d) { selection.filter(function (d) {
return d.type !== 'Connection'; return d.type !== 'Connection';
}).each(function (d) { }).each(function (d) {
components.set(d.id, d.component);

 components.set(d.id, d.component);
// check all connections of this component // check all connections of this component
$.each(nfConnection.getComponentConnections(d.id), function (_, connection) { $.each(nfConnection.getComponentConnections(d.id), function (_, connection) {
@ -1962,11 +1962,11 @@
} }
}); });
}); });
if (isDisconnected) {
 if (isDisconnected) {
// go through each connection to ensure its source and destination are included // go through each connection to ensure its source and destination are included
connections.forEach(function (id, connection) { connections.forEach(function (id, connection) {
if (isDisconnected) {
 if (isDisconnected) {
// determine whether this connection and its components are included within the selection // determine whether this connection and its components are included within the selection
isDisconnected = components.has(nfCanvasUtils.getConnectionSourceComponentId(connection)) && components.has(nfCanvasUtils.getConnectionDestinationComponentId(connection)); isDisconnected = components.has(nfCanvasUtils.getConnectionSourceComponentId(connection)) && components.has(nfCanvasUtils.getConnectionDestinationComponentId(connection));

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
View File

@ -1256,23 +1256,23 @@
* *
* @param {string} groupId * @param {string} groupId
*/ */
enterGroup: function (groupId) {
 enterGroup: function (groupId) {
// hide the context menu // hide the context menu
nfContextMenu.hide();

 nfContextMenu.hide();
// set the new group id // set the new group id
nfCanvasUtils.setGroupId(groupId);

 nfCanvasUtils.setGroupId(groupId);
// reload the graph // reload the graph
return nfCanvasUtils.reload().done(function () {
 return nfCanvasUtils.reload().done(function () {
// attempt to restore the view // attempt to restore the view
var viewRestored = nfCanvasUtils.restoreUserView();

 var viewRestored = nfCanvasUtils.restoreUserView();
// if the view was not restore attempt to fit // if the view was not restore attempt to fit
if (viewRestored === false) { if (viewRestored === false) {
nfCanvasUtils.fitCanvasView();

 nfCanvasUtils.fitCanvasView();
// refresh the canvas // refresh the canvas
nfCanvasUtils.refreshCanvasView({ nfCanvasUtils.refreshCanvasView({