Merge branch 'develop' into NIFI-85

This commit is contained in:
Matt Gilman 2014-12-17 10:15:47 -05:00
commit 045afa5b2e
1 changed files with 6 additions and 1 deletions

View File

@ -395,7 +395,12 @@ nf.StatusHistory = (function () {
} }
// the container for the main chart // the container for the main chart
var chartContainer = $('#status-history-chart-container').resizable('destroy').empty(); var chartContainer = $('#status-history-chart-container').empty();
if (chartContainer.hasClass('ui-resizable')) {
chartContainer.resizable('destroy');
}
// calculate the dimensions
var width = chartContainer.width() - margin.left - margin.right; var width = chartContainer.width() - margin.left - margin.right;
var height = chartContainer.height() - margin.top - margin.bottom; var height = chartContainer.height() - margin.top - margin.bottom;