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 2015/02/12 14:21:46 UTC
[1/2] incubator-nifi git commit: NIFI-341: - Ensuring existing
selection is cleared when adding a new label to the graph.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 685035a86 -> e486c5642
NIFI-341:
- Ensuring existing selection is cleared when adding a new label to the graph.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e0390ec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e0390ec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e0390ec3
Branch: refs/heads/develop
Commit: e0390ec3f4c9f90112addb00eeaa5882a647cdfc
Parents: 685035a
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 12 07:09:18 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 12 07:09:18 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e0390ec3/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
index 8d005e2..3255641 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
@@ -882,7 +882,9 @@ nf.CanvasToolbox = (function () {
nf.Client.setRevision(response.revision);
// add the label to the graph
- nf.Label.add(response.label, true);
+ nf.Graph.add({
+ 'labels': [response.label]
+ }, true);
// update the birdseye
nf.Birdseye.refresh();
[2/2] incubator-nifi git commit: NIFI-343: - Preventing default
action when shift/ctrl clicking images.
Posted by mc...@apache.org.
NIFI-343:
- Preventing default action when shift/ctrl clicking images.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e486c564
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e486c564
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e486c564
Branch: refs/heads/develop
Commit: e486c5642bf7bf0131f3c19a117e8448a75ba8af
Parents: e0390ec
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 12 07:59:04 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 12 07:59:04 2015 -0500
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e486c564/nifi/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/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 83a3117..c9211b2 100644
--- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -393,7 +393,7 @@ nf.CanvasUtils = (function () {
*/
disableImageHref: function (selection) {
selection.on('click.disableImageHref', function () {
- if (d3.event.ctrlKey) {
+ if (d3.event.ctrlKey || d3.event.shiftKey) {
d3.event.preventDefault();
}
});