Repository: nifi Updated Branches: refs/heads/master bd4ea488b -> f8f66fa22
NIFI-3291: - Fixing overflow calculation to determine if scrollbars are necessary. - Fixing styles with jquery ui slider usage. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0950186f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0950186f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0950186f Branch: refs/heads/master Commit: 0950186fbbc69575825da49d4f355314d2e2d178 Parents: bd4ea48 Author: Matt Gilman <[email protected]> Authored: Mon Jan 23 09:10:49 2017 -0500 Committer: Scott Aslan <[email protected]> Committed: Fri Jan 27 11:47:09 2017 -0500 ---------------------------------------------------------------------- .../nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css | 6 ++++++ .../main/webapp/js/nf/canvas/nf-connection-configuration.js | 4 ++-- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 4 ++-- .../src/main/webapp/js/nf/canvas/nf-processor-configuration.js | 4 ++-- .../nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js | 2 +- .../nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js | 4 ++-- .../src/main/webapp/js/nf/provenance/nf-provenance-table.js | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index 11622c5..6584703 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -632,4 +632,10 @@ md-progress-linear > div { .ui-menu .ui-menu-item a.ui-state-active { background: #D4E0E5 !important; border: 1px solid #999999; +} + +/* jquery ui slider override */ + +.ui-slider-handle.ui-state-active { + background: #fff !important; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js index df943fb..a0424aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js @@ -1240,7 +1240,7 @@ nf.ConnectionConfiguration = (function () { // show the border if necessary 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'); } }).fail(function () { @@ -1414,7 +1414,7 @@ nf.ConnectionConfiguration = (function () { // show the border if necessary 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'); } }).fail(function () { http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index 444fe52..3ab4ab9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -243,8 +243,8 @@ nf.ControllerService = (function () { */ var updateReferencingComponentsBorder = function (referenceContainer) { // determine if it is too big - var tooBig = referenceContainer.get(0).scrollHeight > referenceContainer.innerHeight() || - referenceContainer.get(0).scrollWidth > referenceContainer.innerWidth(); + var tooBig = referenceContainer.get(0).scrollHeight > Math.round(referenceContainer.innerHeight()) || + referenceContainer.get(0).scrollWidth > Math.round(referenceContainer.innerWidth()); // draw the border if necessary if (referenceContainer.is(':visible') && tooBig) { http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js index bf13707..aae4bc5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js @@ -501,7 +501,7 @@ nf.ProcessorConfiguration = (function () { // show the border around the processor relationships if necessary 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'); } } @@ -850,7 +850,7 @@ nf.ProcessorConfiguration = (function () { // show the border if necessary 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'); } }).fail(nf.ErrorHandler.handleAjaxError); http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js index 4527c50..c1f42b7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js @@ -542,7 +542,7 @@ // show the border if necessary 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'); } }).fail(errorHandler.handleAjaxError); http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js index 829490f..87b1e60 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js @@ -108,7 +108,7 @@ // show the border if processor relationship names if necessary 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'); } } @@ -307,7 +307,7 @@ // show the border if necessary 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'); } }).fail(function (xhr, status, error) { http://git-wip-us.apache.org/repos/asf/nifi/blob/0950186f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js index 2826e3a..4541893 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js @@ -617,7 +617,7 @@ // adjust the field width for a potential scrollbar 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); } else { $('input.searchable-field-input').width(260);
