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

Merge branch 'master' into NIFI-1267

This commit is contained in:
joewitt 2015-12-07 20:38:44 -05:00
parent fee9f381a7 08d0f3e596
commit 9524f63766
3 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/web.xml
View File

@ -23,7 +23,6 @@
</servlet>
<servlet-mapping>
<servlet-name>NiFiCanvas</servlet-name>
<!--<url-pattern>/token</url-pattern>-->
<url-pattern>/canvas</url-pattern>
</servlet-mapping>

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

@ -349,8 +349,8 @@ nf.CanvasToolbox = (function () {
});
// adjust the grid canvas now that its been rendered
grid.setSelectedRows([0]);
grid.resizeCanvas();
grid.setSelectedRows([0]);
};
/**
@ -884,6 +884,17 @@ nf.CanvasToolbox = (function () {
addToolboxIcon(config.type.template, toolbox, 'template-icon', 'template-icon-hover', 'template-icon-drag', promptForTemplate);
addToolboxIcon(config.type.label, toolbox, 'label-icon', 'label-icon-hover', 'label-icon-drag', createLabel);
// define the function for filtering the list
$('#processor-type-filter').focus(function () {
if ($(this).hasClass(config.styles.filterList)) {
$(this).removeClass(config.styles.filterList).val('');
}
}).blur(function () {
if ($(this).val() === '') {
$(this).addClass(config.styles.filterList).val(config.filterText);
}
}).addClass(config.styles.filterList).val(config.filterText);
// initialize the processor type table
var processorTypesColumns = [
{id: 'type', name: 'Type', field: 'label', sortable: true, resizable: true},
@ -931,16 +942,18 @@ nf.CanvasToolbox = (function () {
var processorType = processorTypesGrid.getDataItem(processorTypeIndex);
// set the processor type description
if (nf.Common.isBlank(processorType.description)) {
$('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#processor-type-description').html(processorType.description).ellipsis();
}
if (nf.Common.isDefinedAndNotNull(processorType)) {
if (nf.Common.isBlank(processorType.description)) {
$('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#processor-type-description').html(processorType.description).ellipsis();
}
// populate the dom
$('#processor-type-name').text(processorType.label).ellipsis();
$('#selected-processor-name').text(processorType.label);
$('#selected-processor-type').text(processorType.type);
// populate the dom
$('#processor-type-name').text(processorType.label).ellipsis();
$('#selected-processor-name').text(processorType.label);
$('#selected-processor-type').text(processorType.type);
}
}
});
@ -1006,17 +1019,6 @@ nf.CanvasToolbox = (function () {
});
}).fail(nf.Common.handleAjaxError);
// define the function for filtering the list
$('#processor-type-filter').focus(function () {
if ($(this).hasClass(config.styles.filterList)) {
$(this).removeClass(config.styles.filterList).val('');
}
}).blur(function () {
if ($(this).val() === '') {
$(this).addClass(config.styles.filterList).val(config.filterText);
}
}).addClass(config.styles.filterList).val(config.filterText);
// configure the new processor dialog
$('#new-processor-dialog').modal({
headerText: 'Add Processor',

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

@ -414,19 +414,21 @@ nf.Settings = (function () {
var controllerServiceType = controllerServiceTypesGrid.getDataItem(controllerServiceTypeIndex);
// set the controller service type description
if (nf.Common.isBlank(controllerServiceType.description)) {
$('#controller-service-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#controller-service-type-description').html(controllerServiceType.description).ellipsis();
if (nf.Common.isDefinedAndNotNull(controllerServiceType)) {
if (nf.Common.isBlank(controllerServiceType.description)) {
$('#controller-service-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#controller-service-type-description').html(controllerServiceType.description).ellipsis();
}
// populate the dom
$('#controller-service-type-name').text(controllerServiceType.label).ellipsis();
$('#selected-controller-service-name').text(controllerServiceType.label);
$('#selected-controller-service-type').text(controllerServiceType.type);
// show the selected controller service
$('#controller-service-description-container').show();
}
// populate the dom
$('#controller-service-type-name').text(controllerServiceType.label).ellipsis();
$('#selected-controller-service-name').text(controllerServiceType.label);
$('#selected-controller-service-type').text(controllerServiceType.type);
// show the selected controller service
$('#controller-service-description-container').show();
}
});
controllerServiceTypesGrid.onDblClick.subscribe(function (e, args) {
@ -1110,19 +1112,21 @@ nf.Settings = (function () {
var reportingTaskType = reportingTaskTypesGrid.getDataItem(reportingTaskTypeIndex);
// set the reporting task type description
if (nf.Common.isBlank(reportingTaskType.description)) {
$('#reporting-task-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#reporting-task-type-description').html(reportingTaskType.description).ellipsis();
if (nf.Common.isDefinedAndNotNull(reportingTaskType)) {
if (nf.Common.isBlank(reportingTaskType.description)) {
$('#reporting-task-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else {
$('#reporting-task-type-description').html(reportingTaskType.description).ellipsis();
}
// populate the dom
$('#reporting-task-type-name').text(reportingTaskType.label).ellipsis();
$('#selected-reporting-task-name').text(reportingTaskType.label);
$('#selected-reporting-task-type').text(reportingTaskType.type);
// show the selected reporting task
$('#reporting-task-description-container').show();
}
// populate the dom
$('#reporting-task-type-name').text(reportingTaskType.label).ellipsis();
$('#selected-reporting-task-name').text(reportingTaskType.label);
$('#selected-reporting-task-type').text(reportingTaskType.type);
// show the selected reporting task
$('#reporting-task-description-container').show();
}
});
reportingTaskTypesGrid.onDblClick.subscribe(function (e, args) {