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

NIFI-325: 

- Code clean up.
- Ensuring the fill color action is available in toolbar and context menu under the same conditions.
- Only applying the new color if different.
This commit is contained in:
Matt Gilman 2015-02-17 11:44:15 -05:00
parent dde5fd51a4
commit 4239797b9f
5 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -843,17 +843,11 @@ nf.Actions = (function () {
* @param {type} selection The selection * @param {type} selection The selection
*/ */
fillColor: function (selection) { fillColor: function (selection) {
var selectedProcessors = selection.filter(function(d) { if (nf.CanvasUtils.isColorable(selection)) {
return nf.CanvasUtils.isProcessor(d3.select(this)); // we know that the entire selection is processors or labels... this
}); // checks if the first item is a processor... if true, all processors
var selectedLabels = selection.filter(function(d) { var allProcessors = nf.CanvasUtils.isProcessor(selection);
return nf.CanvasUtils.isLabel(d3.select(this));
});
var allProcessors = selectedProcessors.size() === selection.size();
var allLabels = selectedLabels.size() === selection.size();
if (allProcessors || allLabels) {
var color; var color;
if (allProcessors) { if (allProcessors) {
color = nf.Processor.defaultColor(); color = nf.Processor.defaultColor();

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

@ -182,34 +182,37 @@ nf.CanvasHeader = (function () {
// get the color and update the styles // get the color and update the styles
var color = $('#fill-color').minicolors('value'); var color = $('#fill-color').minicolors('value');
// update the style for the specified component // ensure the color actually changed
$.ajax({ if (color !== selectedData.component.style['background-color']) {
type: 'PUT', // update the style for the specified component
url: selectedData.component.uri, $.ajax({
data: { type: 'PUT',
'version': revision.version, url: selectedData.component.uri,
'clientId': revision.clientId, data: {
'style[background-color]': color 'version': revision.version,
}, 'clientId': revision.clientId,
dataType: 'json' 'style[background-color]': color
}).done(function (response) { },
// update the revision dataType: 'json'
nf.Client.setRevision(response.revision); }).done(function (response) {
// update the revision
nf.Client.setRevision(response.revision);
// update the processor // update the processor
if (nf.CanvasUtils.isProcessor(selected)) { if (nf.CanvasUtils.isProcessor(selected)) {
nf.Processor.set(response.processor); nf.Processor.set(response.processor);
} else { } else {
nf.Label.set(response.label); nf.Label.set(response.label);
} }
}).fail(function (xhr, status, error) { }).fail(function (xhr, status, error) {
if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) { if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) {
nf.Dialog.showOkDialog({ nf.Dialog.showOkDialog({
dialogContent: nf.Common.escapeHtml(xhr.responseText), dialogContent: nf.Common.escapeHtml(xhr.responseText),
overlayBackground: true overlayBackground: true
}); });
} }
}); });
}
}); });
// close the dialog // close the dialog
@ -255,12 +258,13 @@ nf.CanvasHeader = (function () {
var hex = $('#fill-color-value').val(); var hex = $('#fill-color-value').val();
// only update the fill color when its a valid hex color string // only update the fill color when its a valid hex color string
// #[six hex characters|three hex characters] case insensitive
if (/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(hex)) { if (/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(hex)) {
$('#fill-color').minicolors('value', hex); $('#fill-color').minicolors('value', hex);
} }
}; };
// initialize the fill color value // apply fill color from field on blur and enter press
$('#fill-color-value').on('blur', updateColor).on('keyup', function(e) { $('#fill-color-value').on('blur', updateColor).on('keyup', function(e) {
var code = e.keyCode ? e.keyCode : e.which; var code = e.keyCode ? e.keyCode : e.which;
if (code === $.ui.keyCode.ENTER) { if (code === $.ui.keyCode.ENTER) {

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

@ -141,19 +141,8 @@ nf.CanvasToolbar = (function () {
actions['group'].disable(); actions['group'].disable();
} }
// determine if the current selection is entirely processors or labels // if there are any colorable components enable the fill button
var selectedProcessors = selection.filter(function(d) { if (nf.CanvasUtils.isColorable(selection)) {
return nf.CanvasUtils.isProcessor(d3.select(this));
});
var selectedLabels = selection.filter(function(d) {
return nf.CanvasUtils.isLabel(d3.select(this));
});
var allProcessors = selectedProcessors.size() === selection.size();
var allLabels = selectedLabels.size() === selection.size();
// if there are any colorable components enable the button
if (allProcessors || allLabels) {
actions['fill'].enable(); actions['fill'].enable();
} else { } else {
actions['fill'].disable(); actions['fill'].disable();

21
nifi/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

@ -474,6 +474,27 @@ nf.CanvasUtils = (function () {
}); });
}, },
/**
* Determines if the specified selection is colorable (in a single action).
*
* @param {selection} selection The selection
* @returns {boolean}
*/
isColorable: function(selection) {
// determine if the current selection is entirely processors or labels
var selectedProcessors = selection.filter(function(d) {
return nf.CanvasUtils.isProcessor(d3.select(this));
});
var selectedLabels = selection.filter(function(d) {
return nf.CanvasUtils.isLabel(d3.select(this));
});
var allProcessors = selectedProcessors.size() === selection.size();
var allLabels = selectedLabels.size() === selection.size();
return allProcessors || allLabels;
},
/** /**
* Determines if the specified selection is a connection. * Determines if the specified selection is a connection.
* *

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

@ -179,12 +179,7 @@ nf.ContextMenu = (function () {
* @param {selection} selection The selection * @param {selection} selection The selection
*/ */
var isColorable = function (selection) { var isColorable = function (selection) {
// ensure the correct number of components are selected return nf.Common.isDFM() && nf.CanvasUtils.isColorable(selection);
if (selection.size() !== 1) {
return false;
}
return nf.Common.isDFM() && (nf.CanvasUtils.isProcessor(selection) || nf.CanvasUtils.isLabel(selection));
}; };
/** /**