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

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Mark Payne 2015-01-13 13:35:39 -05:00
parent 21e809a7cb b6b1859475
commit 95b22a0aee
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
View File

@ -313,6 +313,7 @@ span.storage-usage-details {
div.storage-usage-progressbar { div.storage-usage-progressbar {
height: 20px; height: 20px;
border: 1px solid #aaaaaa; border: 1px solid #aaaaaa;
border-radius: 0;
} }
div.storage-usage-progressbar div.ui-progressbar-value { div.storage-usage-progressbar div.ui-progressbar-value {
@ -321,6 +322,7 @@ div.storage-usage-progressbar div.ui-progressbar-value {
line-height: 20px; line-height: 20px;
display: block; display: block;
text-align: center; text-align: center;
border-radius: 0;
} }
/* summary tabs */ /* summary tabs */

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

@ -372,8 +372,12 @@ nf.Canvas = (function () {
}) })
.datum(position); .datum(position);
// prevent further propagation (to parents) // prevent further propagation (to parents and others handlers
d3.event.stopPropagation(); // on the same element to prevent zoom behavior)
d3.event.stopImmediatePropagation();
// prevents the browser from changing to a text selection cursor
d3.event.preventDefault();
} }
}) })
.on('mousemove.selection', function () { .on('mousemove.selection', function () {
@ -385,7 +389,7 @@ nf.Canvas = (function () {
// get the original position // get the original position
var originalPosition = selectionBox.datum(); var originalPosition = selectionBox.datum();
var position = d3.mouse(canvas.node()); var position = d3.mouse(canvas.node());
var d = {}; var d = {};
if (originalPosition[0] < position[0]) { if (originalPosition[0] < position[0]) {
d.x = originalPosition[0]; d.x = originalPosition[0];
@ -407,6 +411,7 @@ nf.Canvas = (function () {
selectionBox.attr(d); selectionBox.attr(d);
} }
// prevent further propagation (to parents)
d3.event.stopPropagation(); d3.event.stopPropagation();
} }
}) })
@ -1210,6 +1215,7 @@ nf.Canvas = (function () {
return { return {
init: function () { init: function () {
var refreshed; var refreshed;
var zoomed = false;
// define the behavior // define the behavior
behavior = d3.behavior.zoom() behavior = d3.behavior.zoom()
@ -1217,7 +1223,13 @@ nf.Canvas = (function () {
.translate(TRANSLATE) .translate(TRANSLATE)
.scale(SCALE) .scale(SCALE)
.on('zoom', function () { .on('zoom', function () {
panning = true; // if we have zoomed, indicate that we are panning
// to prevent deselection elsewhere
if (zoomed) {
panning = true;
} else {
zoomed = true;
}
// see if the scale has changed during this zoom event, // see if the scale has changed during this zoom event,
// we want to only transition when zooming in/out as running // we want to only transition when zooming in/out as running
@ -1250,6 +1262,7 @@ nf.Canvas = (function () {
} }
panning = false; panning = false;
zoomed = false;
}); });
// add the behavior to the canvas and disable dbl click zoom // add the behavior to the canvas and disable dbl click zoom