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

NIFI-27: 

- Latest version of D3.
This commit is contained in:
Matt Gilman 2014-12-10 11:26:27 -05:00
parent 4c959f7298
commit 8a0e2cee4a
3 changed files with 42 additions and 5462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE Executable file → Normal file
View File

@ -1,4 +1,4 @@
Copyright (c) 2013, Michael Bostock Copyright (c) 2010-2014, Michael Bostock
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

5390
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js vendored Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -59,13 +59,6 @@ nf.StatusHistory = (function () {
} }
}; };
/**
* version 3.4+ of D3 provides a mechanism for specifying
* a number of custom formatters. this achieves similar function
* until we're able to upgrade.
*/
var timeFormats = null;
/** /**
* The time offset of the server. * The time offset of the server.
*/ */
@ -378,21 +371,16 @@ nf.StatusHistory = (function () {
// custom time axis formatter // custom time axis formatter
// -------------------------- // --------------------------
// create the formatting function var customTimeFormat = d3.time.format.multi([
var customTimeFormat = function (d) { [':%S.%L', function (d) { return d.getMilliseconds(); }],
var formatter; [':%S', function (d) { return d.getSeconds(); }],
['%H:%M', function (d) { return d.getMinutes(); }],
// identify the most appropriate formatter for this date ['%H:%M', function (d) { return d.getHours(); }],
$.each(timeFormats, function (_, timeFormat) { ['%a %d', function (d) { return d.getDay() && d.getDate() !== 1; }],
if (timeFormat[1](d)) { ['%b %d', function (d) { return d.getDate() !== 1; }],
formatter = timeFormat; ['%B', function (d) { return d.getMonth(); }],
return false; ['%Y', function () { return true; }]
} ]);
});
// return the formatter date
return formatter[0](d);
};
// ---------- // ----------
// main chart // main chart
@ -1136,34 +1124,6 @@ nf.StatusHistory = (function () {
init: function (timeOffset) { init: function (timeOffset) {
serverTimeOffset = timeOffset; serverTimeOffset = timeOffset;
// initialize the time formats
timeFormats = [
[d3.time.format(':%S.%L'), function (d) {
return d.getMilliseconds();
}],
[d3.time.format(':%S'), function (d) {
return d.getSeconds();
}],
[d3.time.format('%H:%M'), function (d) {
return d.getMinutes();
}],
[d3.time.format('%H:%M'), function (d) {
return d.getHours();
}],
[d3.time.format('%a %d'), function (d) {
return d.getDay() && d.getDate() !== 1;
}],
[d3.time.format('%b %d'), function (d) {
return d.getDate() !== 1;
}],
[d3.time.format('%B'), function (d) {
return d.getMonth();
}],
[d3.time.format('%Y'), function () {
return true;
}]
];
nf.Common.addHoverEffect('#status-history-refresh-button', 'button-refresh', 'button-refresh-hover').click(function () { nf.Common.addHoverEffect('#status-history-refresh-button', 'button-refresh', 'button-refresh-hover').click(function () {
var statusHistory = $('#status-history-dialog').data('status-history'); var statusHistory = $('#status-history-dialog').data('status-history');
if (statusHistory !== null) { if (statusHistory !== null) {