From 00f92ec712dbb2608a5231e08dca4d89a64fe9d7 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Mon, 26 Sep 2016 10:20:30 -0400 Subject: [PATCH] [NIFI-2775] update Provenance table GoTo button visibility in FF --- .../main/webapp/js/nf/canvas/nf-settings.js | 8 +++---- .../js/nf/provenance/nf-provenance-table.js | 4 +++- .../webapp/js/nf/summary/nf-summary-table.js | 24 ++++++++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index c7bc0c9547ca..863dd200d9f5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -586,20 +586,20 @@ nf.Settings = (function () { return ''; } - var markup = '
'; + var markup = '
'; // always include a button to view the usage - markup += '
'; + markup += '
'; var hasErrors = !nf.Common.isEmpty(dataContext.component.validationErrors); var hasBulletins = !nf.Common.isEmpty(dataContext.bulletins); if (hasErrors) { - markup += '
'; + markup += '
'; } if (hasBulletins) { - markup += '
'; + markup += '
'; } if (hasErrors || hasBulletins) { 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 09d25e51420c..c002e37dc72b 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 @@ -606,7 +606,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { // define how the column is formatted var showLineageFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; // conditionally include the cluster node id if (nf.Common.SUPPORTS_SVG) { @@ -618,6 +618,8 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { markup += ' 
'; } + markup += '
'; + return markup; }; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js index 33b80932fd46..6ce2bcb16a7d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js @@ -369,7 +369,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) { // define how the column is formatted var processorActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell) { markup += '
 '; @@ -383,6 +383,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; }; @@ -654,7 +656,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) { // define how the column is formatted var connectionActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell) { markup += '
 '; @@ -668,6 +670,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; }; @@ -932,7 +936,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) { // define how the column is formatted var processGroupActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell && dataContext.groupId !== null) { markup += '
 '; @@ -946,6 +950,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; }; @@ -1185,7 +1191,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell) { // define how the column is formatted var inputPortActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell) { markup += '
 '; @@ -1195,6 +1201,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; }; @@ -1425,7 +1433,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell) { // define how the column is formatted var outputPortActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell) { markup += '
 '; @@ -1435,6 +1443,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; }; @@ -1716,7 +1726,7 @@ nf.SummaryTable = (function () { if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) { // define how the column is formatted var remoteProcessGroupActionFormatter = function (row, cell, value, columnDef, dataContext) { - var markup = ''; + var markup = '
'; if (isInShell) { markup += '
 '; @@ -1730,6 +1740,8 @@ nf.SummaryTable = (function () { markup += '
 '; } + markup += '
'; + return markup; };