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

NIFI-3291: 

- Fixing overflow calculation to determine if scrollbars are necessary.
- Fixing styles with jquery ui slider usage.
This commit is contained in:
Matt Gilman 2017-01-23 09:10:49 -05:00 committed by Scott Aslan
parent bd4ea488bb
commit 0950186fbb
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,4 +632,10 @@ md-progress-linear > div {
.ui-menu .ui-menu-item a.ui-state-active { .ui-menu .ui-menu-item a.ui-state-active {
background: #D4E0E5 !important; background: #D4E0E5 !important;
border: 1px solid #999999; border: 1px solid #999999;
}
/* jquery ui slider override */
.ui-slider-handle.ui-state-active {
background: #fff !important;
} }

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

@ -1240,7 +1240,7 @@ nf.ConnectionConfiguration = (function () {
// show the border if necessary // show the border if necessary
var relationshipNames = $('#relationship-names'); var relationshipNames = $('#relationship-names');
if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > relationshipNames.innerHeight()) { if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > Math.round(relationshipNames.innerHeight())) {
relationshipNames.css('border-width', '1px'); relationshipNames.css('border-width', '1px');
} }
}).fail(function () { }).fail(function () {
@ -1414,7 +1414,7 @@ nf.ConnectionConfiguration = (function () {
// show the border if necessary // show the border if necessary
var relationshipNames = $('#relationship-names'); var relationshipNames = $('#relationship-names');
if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > relationshipNames.innerHeight()) { if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > Math.round(relationshipNames.innerHeight())) {
relationshipNames.css('border-width', '1px'); relationshipNames.css('border-width', '1px');
} }
}).fail(function () { }).fail(function () {

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

@ -243,8 +243,8 @@ nf.ControllerService = (function () {
*/ */
var updateReferencingComponentsBorder = function (referenceContainer) { var updateReferencingComponentsBorder = function (referenceContainer) {
// determine if it is too big // determine if it is too big
var tooBig = referenceContainer.get(0).scrollHeight > referenceContainer.innerHeight() || var tooBig = referenceContainer.get(0).scrollHeight > Math.round(referenceContainer.innerHeight()) ||
referenceContainer.get(0).scrollWidth > referenceContainer.innerWidth(); referenceContainer.get(0).scrollWidth > Math.round(referenceContainer.innerWidth());
// draw the border if necessary // draw the border if necessary
if (referenceContainer.is(':visible') && tooBig) { if (referenceContainer.is(':visible') && tooBig) {

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

@ -501,7 +501,7 @@ nf.ProcessorConfiguration = (function () {
// show the border around the processor relationships if necessary // show the border around the processor relationships if necessary
var processorRelationships = $('#auto-terminate-relationship-names'); var processorRelationships = $('#auto-terminate-relationship-names');
if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > processorRelationships.innerHeight()) { if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > Math.round(processorRelationships.innerHeight())) {
processorRelationships.css('border-width', '1px'); processorRelationships.css('border-width', '1px');
} }
} }
@ -850,7 +850,7 @@ nf.ProcessorConfiguration = (function () {
// show the border if necessary // show the border if necessary
var processorRelationships = $('#auto-terminate-relationship-names'); var processorRelationships = $('#auto-terminate-relationship-names');
if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > processorRelationships.innerHeight()) { if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > Math.round(processorRelationships.innerHeight())) {
processorRelationships.css('border-width', '1px'); processorRelationships.css('border-width', '1px');
} }
}).fail(nf.ErrorHandler.handleAjaxError); }).fail(nf.ErrorHandler.handleAjaxError);

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
View File

@ -542,7 +542,7 @@
// show the border if necessary // show the border if necessary
var relationshipNames = $('#read-only-relationship-names'); var relationshipNames = $('#read-only-relationship-names');
if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > relationshipNames.innerHeight()) { if (relationshipNames.is(':visible') && relationshipNames.get(0).scrollHeight > Math.round(relationshipNames.innerHeight())) {
relationshipNames.css('border-width', '1px'); relationshipNames.css('border-width', '1px');
} }
}).fail(errorHandler.handleAjaxError); }).fail(errorHandler.handleAjaxError);

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
View File

@ -108,7 +108,7 @@
// show the border if processor relationship names if necessary // show the border if processor relationship names if necessary
var processorRelationships = $('#read-only-auto-terminate-relationship-names'); var processorRelationships = $('#read-only-auto-terminate-relationship-names');
if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > processorRelationships.innerHeight()) { if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > Math.round(processorRelationships.innerHeight())) {
processorRelationships.css('border-width', '1px'); processorRelationships.css('border-width', '1px');
} }
} }
@ -307,7 +307,7 @@
// show the border if necessary // show the border if necessary
var processorRelationships = $('#read-only-auto-terminate-relationship-names'); var processorRelationships = $('#read-only-auto-terminate-relationship-names');
if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > processorRelationships.innerHeight()) { if (processorRelationships.is(':visible') && processorRelationships.get(0).scrollHeight > Math.round(processorRelationships.innerHeight())) {
processorRelationships.css('border-width', '1px'); processorRelationships.css('border-width', '1px');
} }
}).fail(function (xhr, status, error) { }).fail(function (xhr, status, error) {

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
View File

@ -617,7 +617,7 @@
// adjust the field width for a potential scrollbar // adjust the field width for a potential scrollbar
var searchFieldContainer = $('#searchable-fields-container'); var searchFieldContainer = $('#searchable-fields-container');
if (searchFieldContainer.get(0).scrollHeight > searchFieldContainer.innerHeight()) { if (searchFieldContainer.get(0).scrollHeight > Math.round(searchFieldContainer.innerHeight())) {
$('input.searchable-field-input').width(245); $('input.searchable-field-input').width(245);
} else { } else {
$('input.searchable-field-input').width(260); $('input.searchable-field-input').width(260);