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

[NIFI-1879] Update containment for status history dialog. This closes #557

This commit is contained in:
Scott Aslan 2016-06-21 17:19:40 -04:00 committed by Matt Gilman
parent 61a2054b38
commit 8ed66e5df1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
View File

@ -850,15 +850,18 @@ nf.StatusHistory = (function () {
}, },
start: function (e, ui) { start: function (e, ui) {
var helperOffset = ui.helper.offset(); var helperOffset = ui.helper.offset();
var dialogOuter = ((statusHistoryDialog.outerWidth() - statusHistoryDialog.width()) / 2); var dialogOuter = ((statusHistoryDialog.outerWidth() - statusHistoryDialog.width()) / 2) + 8; //8 for the box shadow
var dialogContent = statusHistoryDialog.find('.dialog-content');
var dialogContentPaddingRight = ((dialogContent.outerWidth() - dialogContent.width()) / 2);
var chartOuter = chartContainer.outerWidth() - chartContainer.width(); var chartOuter = chartContainer.outerWidth() - chartContainer.width();
// calculate the max width of the component // calculate the max width of the component
maxWidth = $(document).width() - helperOffset.left - dialogOuter - chartOuter; maxWidth = $('body').width() - helperOffset.left - dialogOuter - dialogContentPaddingRight - chartOuter;
// calculate the max height of the component // calculate the max height of the component
var containerOuter = $('#status-history-container').outerHeight(true) - $('#status-history-container').height(); var dialogContentPaddingBottom = ((dialogContent.outerHeight() - dialogContent.height()) / 2);
maxHeight = $(document).height() - helperOffset.top - dialogOuter - chartOuter - containerOuter - chartControlContainer.outerHeight(true); var dialogButtonsHeight = statusHistoryDialog.find('.dialog-buttons').height() + 5; //5 for the box shadow
maxHeight = $('body').height() - helperOffset.top - dialogOuter - chartOuter - dialogContentPaddingBottom - dialogButtonsHeight - chartControlContainer.outerHeight(true);
// record the current extent so it can be reset on stop // record the current extent so it can be reset on stop
if (!brush.empty()) { if (!brush.empty()) {