NIFI-565: - Ensuring tooltips are properly disposed. Without proper cleanup the bulletins were not being initialized correctly, when new bulletins would arise. - Increasing the max width of tooltips.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a896510d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a896510d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a896510d Branch: refs/heads/NIFI-680 Commit: a896510d7f0c60184ac37159f39c2f2fbc11208f Parents: e767f5c Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Tue Jun 23 14:09:45 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Tue Jun 23 14:09:45 2015 -0400 ---------------------------------------------------------------------- .../nifi-web/nifi-web-ui/src/main/webapp/css/main.css | 1 + .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js | 2 +- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a896510d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css index e161efc..70916c6 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css @@ -115,6 +115,7 @@ div.nifi-tooltip { border: 1px solid #454545; background-color: #FFFFA3; color: #454545; + max-width: 500px; } .ellipsis { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a896510d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js index ca45a3d..59f38a5 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js @@ -811,7 +811,7 @@ nf.Canvas = (function () { // bulletins for this processor are now gone if (bulletins.length === 0) { if (bulletinIcon.data('qtip')) { - bulletinIcon.removeClass('has-bulletins').qtip('destroy'); + bulletinIcon.removeClass('has-bulletins').qtip('api').destroy(true); } // hide the icon http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a896510d/nifi/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/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index e8a111d..65c6dfa 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -264,7 +264,7 @@ nf.ControllerService = (function () { }, nf.CanvasUtils.config.systemTooltipConfig)); } } else if (icon.data('qtip')) { - icon.qtip('destroy'); + icon.qtip('api').destroy(true); } return state; }); @@ -294,7 +294,7 @@ nf.ControllerService = (function () { }, nf.CanvasUtils.config.systemTooltipConfig)); } } else if (icon.data('qtip')) { - icon.qtip('destroy'); + icon.qtip('api').destroy(true); } return state; });
