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 2017/03/17 15:47:08 UTC
nifi git commit: NIFI-3615: - Removing hidden control characters.
Repository: nifi
Updated Branches:
refs/heads/master 768e89b57 -> 47c6718fe
NIFI-3615:
- Removing hidden control characters.
This closes #1599
Signed-off-by: Scott Aslan <sc...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/47c6718f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/47c6718f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/47c6718f
Branch: refs/heads/master
Commit: 47c6718fe26c27b957f6b4a30f57eaf4089630ec
Parents: 768e89b
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Mar 17 08:15:28 2017 -0400
Committer: Scott Aslan <sc...@gmail.com>
Committed: Fri Mar 17 11:46:25 2017 -0400
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-canvas-utils.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-connection.js | 12 ++++++------
.../src/main/webapp/js/nf/canvas/nf-process-group.js | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/47c6718f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 4fb31c9..055157f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -115,7 +115,7 @@
// refresh all component types as necessary (handle components that have been removed)
componentMap.forEach(function (type, ids) {
nfCanvasUtils.getComponentByType(type).remove(ids);
- });\u2028\u2028
+ });
// refresh the birdseye
nfBirdseye.refresh();
http://git-wip-us.apache.org/repos/asf/nifi/blob/47c6718f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
index d7e2e3a..14f6880 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
@@ -1931,7 +1931,7 @@
*
* @argument {selection} selection The selection
*/
- isDisconnected: function (selection) {\u2028
+ isDisconnected: function (selection) {
// if nothing is selected return
if (selection.empty()) {
@@ -1939,20 +1939,20 @@
}
var connections = d3.map();
var components = d3.map();
- var isDisconnected = true;\u2028\u2028
+ var isDisconnected = true;
// include connections
selection.filter(function (d) {
return d.type === 'Connection';
}).each(function (d) {
connections.set(d.id, d);
- });\u2028\u2028
+ });
// include components and ensure their connections are included
selection.filter(function (d) {
return d.type !== 'Connection';
}).each(function (d) {
- components.set(d.id, d.component);\u2028\u2028
+ components.set(d.id, d.component);
// check all connections of this component
$.each(nfConnection.getComponentConnections(d.id), function (_, connection) {
@@ -1962,11 +1962,11 @@
}
});
});
- if (isDisconnected) {\u2028
+ if (isDisconnected) {
// go through each connection to ensure its source and destination are included
connections.forEach(function (id, connection) {
- if (isDisconnected) {\u2028
+ if (isDisconnected) {
// determine whether this connection and its components are included within the selection
isDisconnected = components.has(nfCanvasUtils.getConnectionSourceComponentId(connection)) && components.has(nfCanvasUtils.getConnectionDestinationComponentId(connection));
http://git-wip-us.apache.org/repos/asf/nifi/blob/47c6718f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
index 75f1916..bec3d6c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
@@ -1256,23 +1256,23 @@
*
* @param {string} groupId
*/
- enterGroup: function (groupId) {\u2028
+ enterGroup: function (groupId) {
// hide the context menu
- nfContextMenu.hide();\u2028\u2028
+ nfContextMenu.hide();
// set the new group id
- nfCanvasUtils.setGroupId(groupId);\u2028\u2028
+ nfCanvasUtils.setGroupId(groupId);
// reload the graph
- return nfCanvasUtils.reload().done(function () {\u2028
+ return nfCanvasUtils.reload().done(function () {
// attempt to restore the view
- var viewRestored = nfCanvasUtils.restoreUserView();\u2028\u2028
+ var viewRestored = nfCanvasUtils.restoreUserView();
// if the view was not restore attempt to fit
if (viewRestored === false) {
- nfCanvasUtils.fitCanvasView();\u2028\u2028
+ nfCanvasUtils.fitCanvasView();
// refresh the canvas
nfCanvasUtils.refreshCanvasView({