@@ -498,13 +503,19 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
_(Interface)_
-
+
-
@@ -531,12 +542,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
-
+
_(Mode of operation)_
@@ -584,7 +590,7 @@ switch ($themeHelper->getThemeName()) { // $themeHelper set in DefaultPageLayout
?>
-
+
@@ -1427,8 +1433,8 @@ var rxd = [];
var txd = [];
var cputime = 0;
var nettime = 0;
-var cpuline = cookie.cpuline||30;
-var netline = cookie.netline||30;
+var cpuline = parseInt(cookie.cpuline)||30;
+var netline = parseInt(cookie.netline)||30;
var update2 = true;
var box = null;
var startup = true;
@@ -1436,56 +1442,92 @@ var stopgap = '
var recall = null;
var recover = null;
-var options_cpu = {
- series:[{name:'load', data:cpu.slice()}],
- chart:{height:120, type:'line', fontFamily:'clear-sans', animations:{enabled:true, easing:'linear', dynamicAnimation:{speed:980}}, toolbar:{show:false}, zoom:{enabled:false},events:{updated:function(){if (cpuchart.customData.updateCount == 0) {cpuchart.customData.animationPending = false}cpuchart.customData.updateCount++;},animationEnd:function(){cpuchart.customData.animationPending = false;updateCPUChart();}}},
- dataLabels:{enabled:false},
- tooltip:{enabled:false},
- stroke:{curve:'smooth', width:1},
- colors:['#ff8c2f'],
- markers:{size:0},
- xaxis:{type:'datetime', range:cpuline-1, labels:{show:false}, axisTicks:{show:false}, axisBorder:{show:false}},
- yaxis:{max:100, min:0, tickAmount:4, labels:{formatter:function(v,i){return v.toFixed(0)+' %';}, style:{colors:''}}, axisBorder:{show:false}, axisTicks:{show:false}},
- grid:{show:true, borderColor:''},
- legend:{show:false}
-};
-var options_net = {
- series:[{name:'receive', data:rxd.slice()},{name:'transmit', data:txd.slice()}],
- chart:{height:120, type:'line', fontFamily:'clear-sans', animations:{enabled:true, easing:'linear', dynamicAnimation:{speed:980}}, toolbar:{show:false}, zoom:{enabled:false},events:{updated:function(){if (netchart.customData.updateCount == 0) {netchart.customData.animationPending = false}netchart.customData.updateCount++;},animationEnd:function(){netchart.customData.animationPending = false;updateNetChart();}}},
- dataLabels:{enabled:false},
- tooltip:{enabled:false},
- stroke:{curve:'smooth', width:1},
- colors:['#e22828','#ff8c2f'],
- markers:{size:0},
- xaxis:{type:'datetime', range:netline-1, labels:{show:false}, axisTicks:{show:false}, axisBorder:{show:false}},
- yaxis:{tickAmount:4, labels:{formatter:function(v,i){return autoscale(v,'bps',1);}, style:{colors:''}}, axisBorder:{show:false}, axisTicks:{show:false}},
- grid:{show:true, borderColor:''},
- legend:{show:false}
-};
+// Helper function to calculate millisPerPixel based on container width
+function getMillisPerPixel(timeInSeconds, containerId) {
+ var container = document.getElementById(containerId);
+ var width = (container && container.offsetWidth > 0) ? container.offsetWidth : 600; // fallback to 600 if not found or zero width
+ return (timeInSeconds * 1000) / width;
+}
-var cpuchart = new ApexCharts(document.querySelector('#cpuchart'), options_cpu);
-var netchart = new ApexCharts(document.querySelector('#netchart'), options_net);
+// SmoothieCharts initialization
+var cpuchart = new SmoothieChart({
+ millisPerPixel: (cpuline * 1000) / 600, // Safe initial value
+ minValue: -1,
+ maxValue: 100,
+ responsive: true,
+ grid: {
+ strokeStyle: '',
+ fillStyle: 'transparent',
+ lineWidth: 1,
+ millisPerLine: 5000,
+ verticalSections: 4
+ },
+ labels: {
+ fillStyle: '',
+ fontSize: 11,
+ precision: 0
+ },
+ timestampFormatter: function(date) { return ''; },
+ minValueScale: 1.02,
+ maxValueScale: 1.02,
+ yMinFormatter: function(value) {
+ return Math.max(0, Math.floor(value)) + ' %';
+ },
+ yMaxFormatter: function(value) {
+ return Math.max(0, Math.min(100, Math.ceil(value))) + ' %';
+ }
+});
-// Add custom global variable to ncharts (won't affect ApexCharts functionality)
+var netchart = new SmoothieChart({
+ millisPerPixel: (netline * 1000) / 600, // Safe initial value
+ minValue: 0,
+ responsive: true,
+ grid: {
+ strokeStyle: '',
+ fillStyle: 'transparent',
+ lineWidth: 1,
+ millisPerLine: 5000,
+ verticalSections: 4
+ },
+ labels: {
+ fillStyle: '',
+ fontSize: 11,
+ placement: 'left'
+ },
+ timestampFormatter: function(date) { return ''; },
+ minValueScale: 1.02,
+ maxValueScale: 1.02,
+ yMaxFormatter: function(value) {
+ if (value >= 1000) {
+ return Math.floor(value / 1000) + ' Mbps';
+ }
+ return Math.floor(value) + ' kbps';
+ },
+ yMinFormatter: function(value) {
+ return Math.floor(value) + ' kbps';
+ }
+});
+
+// Create TimeSeries for CPU and Network data
+var cpuTimeSeries = new TimeSeries();
+var rxTimeSeries = new TimeSeries();
+var txTimeSeries = new TimeSeries();
+
+// Add TimeSeries to charts with colors
+cpuchart.addTimeSeries(cpuTimeSeries, { strokeStyle: '#ff8c2f', lineWidth: 1 });
+netchart.addTimeSeries(rxTimeSeries, { strokeStyle: '#e22828', lineWidth: 1 });
+netchart.addTimeSeries(txTimeSeries, { strokeStyle: '#ff8c2f', lineWidth: 1 });
+
+// Custom data for chart state management
netchart.customData = {
- isVisible: false,
- BrowserVisibility: true,
- animationPending: false,
- netAnimationInterval: null,
- newData: false,
- updateCount: 0,
- initialized: false
+ isVisible: false
};
cpuchart.customData = {
isVisible: false,
- BrowserVisibility: true,
- animationPending: false,
- cpuAnimationInterval: null,
coresVisible: false,
- newData: false,
- updateCount: 0,
- initialized: false
+ cpuData: null,
+ cpuLoad: 0
};
$(function() {
@@ -1495,9 +1537,9 @@ $(function() {
entries.forEach(entry => {
if (entry.target === netchartElement) {
netchart.customData.isVisible = entry.isIntersecting;
- // Reset the update count as the chart doesn't always fire animationEnd in this case
+ // Chart visibility changed
if (netchart.customData.isVisible) {
- resetNetUpdateCount();
+ // SmoothieCharts handles visibility automatically
}
}
});
@@ -1520,9 +1562,9 @@ $(function() {
entries.forEach(entry => {
if (entry.target === cpuchartElement) {
cpuchart.customData.isVisible = entry.isIntersecting;
- // Reset the update count as the chart doesn't always fire animationEnd in this case
+ // Chart visibility changed
if (cpuchart.customData.isVisible) {
- resetCPUUpdateCount();
+ // SmoothieCharts handles visibility automatically
}
}
});
@@ -1588,8 +1630,9 @@ let viewportResizeTimeout;
window.addEventListener('resize', function(){
clearTimeout(viewportResizeTimeout);
viewportResizeTimeout = setTimeout(function(){
- resetNetUpdateCount();
- resetCPUUpdateCount();
+ // Update millisPerPixel based on new container sizes
+ cpuchart.options.millisPerPixel = getMillisPerPixel(cpuline, 'cpuchart');
+ netchart.options.millisPerPixel = getMillisPerPixel(netline, 'netchart');
}, 250); // Wait 250ms after resize stops before executing
});
@@ -1627,80 +1670,45 @@ function sanitizeMultiCookie(cookieName, delimiter, removeDuplicates=false) {
}
function initCharts(clear) {
- // initialize graphs entries
- var data = [];
- data.cpu = data.rxd = data.txd = "";
-
- var now = new Date().getTime();
- if (!clear) {
- var c = data.cpu.split(';');
- var r = data.rxd.split(';');
- var t = data.txd.split(';');
- for (var i=0; i < cpuline; i++) {
- var x = now + i;
- var y = c[i]||0; cpu.push({x,y});
- }
- cputime = x + 1;
- } else {
- // clear network graph
- var r = ''; var t = '';
- rxd = []; txd = [];
+ // SmoothieCharts manages its own data through TimeSeries
+ if (clear) {
+ // Clear the TimeSeries data if needed
+ rxTimeSeries.clear();
+ txTimeSeries.clear();
}
- for (var i=0; i < netline; i++) {
- var x = now + i;
- var y = r[i]||0; rxd.push({x,y});
- var y = t[i]||0; txd.push({x,y});
- }
- nettime = x + 1;
}
function resetCharts() {
- // prevent unlimited graph growing - limit to 300 (5 minutes) of data
- cpu = cpu.slice(-300);
- rxd = rxd.slice(-300);
- txd = txd.slice(-300);
+ // SmoothieCharts automatically manages data retention
+ // No manual cleanup needed
}
function addChartCpu(load) {
- cputime++;
- var i = cpu.length - cpuline;
- if (i > 0) { // clear value outside graph
- i = i - 1;
- cpu[i].x = cputime - cpuline;
- cpu[i].y = 0;
- }
- cpu.push({x:cputime, y:load});
+ // Add data point to SmoothieCharts TimeSeries
+ cpuTimeSeries.append(new Date().getTime(), load);
}
function addChartNet(rx, tx) {
- nettime++;
- var i = rxd.length - netline;
- if (i > 0) { // clear value outside graph
- i = i - 1;
- rxd[i].x = nettime - netline;
- rxd[i].y = 0;
- txd[i].x = nettime - netline;
- txd[i].y = 0;
- }
- rxd.push({x:nettime, y:rx});
- txd.push({x:nettime, y:tx});
+ // Add data points to SmoothieCharts TimeSeries (convert bps to kbps)
+ var now = new Date().getTime();
+ rxTimeSeries.append(now, Math.floor(rx / 1000));
+ txTimeSeries.append(now, Math.floor(tx / 1000));
}
-function resetCPUUpdateCount() {
- cpuchart.customData.updateCount = 0;
- cpuchart.customData.animationPending = false;
-}
+// Cache for last values to avoid unnecessary DOM updates
+var lastCpuValues = {
+ load: -1,
+ color: '',
+ fontColor: '',
+ coreValues: {}
+};
-function resetNetUpdateCount() {
- netchart.customData.updateCount = 0;
- netchart.customData.animationPending = false;
-}
function updateCPUBarCharts() {
if (!isPageVisible()) {
return;
}
// prevent an initial JS error if the first datapoint isn't available yet
- // (cpuchart.customData.newData is reset by the updateCPUChart function so can't be used)
+ // Update CPU bar charts based on current data
const customData = cpuchart.customData;
if (!customData.cpuData?.cpus || typeof customData.cpuLoad === 'undefined') {
return;
@@ -1709,90 +1717,91 @@ function updateCPUBarCharts() {
const cpuLoad = customData.cpuLoad;
const critical = ;
const warning = ;
-
- // Cache DOM elements and calculations for overall CPU load
- const cpuLoadText = cpuLoad + '%';
- const cpuLoadColor = setColor(cpuLoad, critical, warning);
- const cpuLoadFontColor = fontColor(cpuLoad, critical, warning);
-
- // Batch DOM updates for overall CPU load
- const $cpuElements = $('.cpu_, .cpu');
- const $cpuAliveElements = $('#cpu_, #cpu');
-
- $cpuElements.text(cpuLoadText).css({'color': cpuLoadFontColor});
- $cpuAliveElements.alive(cpuLoadText, cpuLoadColor);
+
+ // Only update DOM if values have changed
+ if (cpuLoad !== lastCpuValues.load) {
+ const cpuLoadText = cpuLoad + '%';
+ const cpuLoadColor = setColor(cpuLoad, critical, warning);
+ const cpuLoadFontColor = fontColor(cpuLoad, critical, warning);
+
+ // Batch DOM updates for overall CPU load
+ const $cpuElements = $('.cpu_, .cpu');
+ const $cpuAliveElements = $('#cpu_, #cpu');
+
+ $cpuElements.text(cpuLoadText).css({'color': cpuLoadFontColor});
+
+ // Only call alive() if color actually changed
+ //if (cpuLoadColor !== lastCpuValues.color) {
+ $cpuAliveElements.alive(cpuLoadText, cpuLoadColor);
+ lastCpuValues.color = cpuLoadColor;
+ // }
+
+ lastCpuValues.load = cpuLoad;
+ lastCpuValues.fontColor = cpuLoadFontColor;
+ }
// Update individual CPU cores if they are visible
if (customData.coresVisible) {
const cpus = customData.cpuData.cpus;
-
+
// Batch DOM updates for CPU cores
const cpuCoreUpdates = [];
const cpuAliveUpdates = [];
-
+
cpus.forEach((cpuCore, index) => {
- const coreLoad = Math.round(cpuCore.percentTotal);
- const coreLoadText = coreLoad + '%';
- const coreColor = setColor(coreLoad, critical, warning);
- const coreFontColor = fontColor(coreLoad, critical, warning);
-
- cpuCoreUpdates.push({
- selector: '.cpu' + index,
- text: coreLoadText,
- color: coreFontColor
+ const coreLoad = Math.floor(cpuCore.percentTotal);
+
+ // Only process if value changed
+ if (!lastCpuValues.coreValues[index] || lastCpuValues.coreValues[index].load !== coreLoad) {
+ const coreLoadText = coreLoad + '%';
+ const coreColor = setColor(coreLoad, critical, warning);
+ const coreFontColor = fontColor(coreLoad, critical, warning);
+
+ cpuCoreUpdates.push({
+ selector: '.cpu' + index,
+ text: coreLoadText,
+ color: coreFontColor
+ });
+
+ // Only update alive() if color changed
+ const lastCore = lastCpuValues.coreValues[index] || {};
+ //if (coreColor !== lastCore.color) {
+ cpuAliveUpdates.push({
+ selector: '#cpu' + index,
+ text: coreLoadText,
+ color: coreColor
+ });
+ lastCore.color = coreColor;
+ // }
+
+ // Update cache
+ lastCpuValues.coreValues[index] = {
+ load: coreLoad,
+ color: coreColor,
+ fontColor: coreFontColor
+ };
+ }
+ });
+
+ // Apply batch updates only for changed values
+ if (cpuCoreUpdates.length > 0) {
+ cpuCoreUpdates.forEach(update => {
+ $(update.selector).text(update.text).css({'color': update.color});
});
-
- cpuAliveUpdates.push({
- selector: '#cpu' + index,
- text: coreLoadText,
- color: coreColor
+ }
+
+ if (cpuAliveUpdates.length > 0) {
+ cpuAliveUpdates.forEach(update => {
+ $(update.selector).alive(update.text, update.color);
});
- });
-
- // Apply all CPU core updates in batches
- cpuCoreUpdates.forEach(update => {
- $(update.selector).text(update.text).css({'color': update.color});
- });
-
- cpuAliveUpdates.forEach(update => {
- $(update.selector).alive(update.text, update.color);
- });
+ }
}
}
-function updateCPUChart() {
- if (!cpuchart.customData.newData || !cpuchart.customData.isVisible || !isPageVisible()) {
- return;
- }
- // Check if the animation is still running and a timeout hasn't been set
- if (!cpuchart.customData.animationPending) {
- // No animation running. Clear out the timeout and update the chart
- cpuchart.customData.animationPending = true;
- cpuchart.customData.newData = false;
- cpuchart.updateSeries([{data:cpu}]);
- }
-}
-
-function updateNetChart() {
- if (!netchart.customData.newData || !netchart.customData.isVisible || !isPageVisible()) {
- return;
- }
- // Check if the animation is still running and a timeout hasn't been set
- if (!netchart.customData.animationPending) {
- // No animation running. Clear out the timeout and update the chart
- netchart.customData.animationPending = true;
- netchart.customData.newData = false;
- netchart.updateSeries([{data:rxd},{data:txd}]);
- }
-}
function isPageVisible() {
- // Check if charts are good to go
- if (netchart.customData.initialized && cpuchart.customData.initialized) {
- return !document.hidden;
- } else {
- return false;
- }
+ // SmoothieCharts handles visibility automatically
+ return !document.hidden;
}
@@ -1905,21 +1914,23 @@ function changeView(item) {
}
function changeCPUline(val) {
- cpuline = val;
+ cpuline = parseInt(val);
if (val==30) delete cookie.cpuline; else cookie.cpuline = val;
saveCookie();
- // Reset the update count as the chart doesn't always fire animationEnd
- resetCPUUpdateCount();
- cpuchart.updateOptions({xaxis:{range:cpuline-1}});
+ // Update chart range
+ // Update SmoothieChart time window based on actual chart width
+ cpuchart.options.millisPerPixel = getMillisPerPixel(cpuline, 'cpuchart');
+ // No need to stop and restart, just update the option
}
function changeNetline(val) {
- netline = val;
+ netline = parseInt(val);
if (val==30) delete cookie.netline; else cookie.netline = val;
saveCookie();
- // Reset the update count as the chart doesn't always fire animationEnd
- resetNetUpdateCount();
- netchart.updateOptions({xaxis:{range:netline-1}});
+ // Update chart range
+ // Update SmoothieChart time window based on actual chart width
+ netchart.options.millisPerPixel = getMillisPerPixel(netline, 'netchart');
+ // No need to stop and restart, just update the option
}
function smartMenu(table) {
@@ -2585,20 +2596,41 @@ dashboard.on('message',function(msg,meta) {
// rx & tx speeds
for (let i=0,port; port=get.port[i]; i++) {
if (port[0] == port_select) {
- $('#inbound').text(port[1]);
- $('#outbound').text(port[2]);
+ // Cache for network values to avoid unnecessary DOM updates
+ if (!window.lastNetValues) window.lastNetValues = { inbound: '', outbound: '' };
+
+ // Only update DOM if values changed
+ if (port[1] !== window.lastNetValues.inbound) {
+ $('#inbound').text(port[1]);
+ window.lastNetValues.inbound = port[1];
+ }
+ if (port[2] !== window.lastNetValues.outbound) {
+ $('#outbound').text(port[2]);
+ window.lastNetValues.outbound = port[2];
+ }
+
// update the netchart but only send to ApexCharts if the chart is visible
- addChartNet(port[3], port[4]);
- netchart.customData.newData = true;
- updateNetChart();
-
+ addChartNet(port[3], port[4]);
+
break;
}
}
- // port counters
- for (let k=0; k < get.mode.length; k++) $('#main'+k).html(get.mode[k]);
- for (let k=0; k < get.rxtx.length; k++) $('#port'+k).html(get.rxtx[k]);
- for (let k=0; k < get.stat.length; k++) $('#link'+k).html(get.stat[k]);
+ // port counters - batch check for changes
+ for (let k=0; k < get.mode.length; k++) {
+ const $elem = $('#main'+k);
+ const newVal = get.mode[k];
+ if ($elem.html() !== newVal) $elem.html(newVal);
+ }
+ for (let k=0; k < get.rxtx.length; k++) {
+ const $elem = $('#port'+k);
+ const newVal = get.rxtx[k];
+ if ($elem.html() !== newVal) $elem.html(newVal);
+ }
+ for (let k=0; k < get.stat.length; k++) {
+ const $elem = $('#link'+k);
+ const newVal = get.stat[k];
+ if ($elem.html() !== newVal) $elem.html(newVal);
+ }
// current date and time
$('#current_time').html(get.time[0]);
$('#current_time_').html(get.time[0]);
@@ -2653,8 +2685,15 @@ $(function() {
initCharts();
- cpuchart.render();
- netchart.render();
+ // Start SmoothieCharts streaming
+ cpuchart.streamTo(document.getElementById('cpuchart'), 1000);
+ netchart.streamTo(document.getElementById('netchart'), 1000);
+
+ // Set millisPerPixel after DOM is ready and charts are attached
+ setTimeout(function() {
+ cpuchart.options.millisPerPixel = getMillisPerPixel(cpuline, 'cpuchart');
+ netchart.options.millisPerPixel = getMillisPerPixel(netline, 'netchart');
+ }, 100);
addProperties();
@@ -2686,13 +2725,11 @@ $(function() {
next: (result) => {
if (result.data?.systemMetricsCpu) {
cpuchart.customData.cpuData = result.data.systemMetricsCpu;
- cpuchart.customData.cpuLoad = Math.round(cpuchart.customData.cpuData.percentTotal);
+ cpuchart.customData.cpuLoad = Math.floor(cpuchart.customData.cpuData.percentTotal);
- //update cpu chart data
- addChartCpu(cpuchart.customData.cpuLoad);
- cpuchart.customData.newData = true;
+ //update cpu chart data
+ addChartCpu(cpuchart.customData.cpuLoad);
updateCPUBarCharts();
- updateCPUChart();
}
},
@@ -2731,8 +2768,7 @@ $(function() {
// Inhibit chart updates until DOM quiets down
setTimeout(function() {
- netchart.customData.initialized = true;
- cpuchart.customData.initialized = true;
+ // Charts initialized
},500);
// Cleanup GraphQL subscription on page unload
@@ -2743,4 +2779,4 @@ $(function() {
});
});
-
\ No newline at end of file
+
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index d4ff614e8..88df03ea2 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -876,7 +876,7 @@ _(Spin down delay)_:
_(File system status)_:
-:
+:
_(File system type)_:
@@ -912,7 +912,6 @@ _(File system type)_:
echo get_inline_fs_warnings($disk);
?>
-
_(Allocation profile)_:
diff --git a/emhttp/plugins/dynamix/Diagnostics.page b/emhttp/plugins/dynamix/Diagnostics.page
index d710fc25d..7cbba6656 100644
--- a/emhttp/plugins/dynamix/Diagnostics.page
+++ b/emhttp/plugins/dynamix/Diagnostics.page
@@ -110,15 +110,16 @@ to the system log.*
*Use* **Anonymize diagnostics** *when publishing the diagnostics file in the public forum. In private communication with Limetech it is recommended to uncheck this setting and capture all information unaltered.*
:end
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/emhttp/plugins/dynamix/NewConfig.page b/emhttp/plugins/dynamix/NewConfig.page
index 0f3205335..53e50942e 100644
--- a/emhttp/plugins/dynamix/NewConfig.page
+++ b/emhttp/plugins/dynamix/NewConfig.page
@@ -62,30 +62,38 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
-_(Preserve current assignments)_:
-:
+
+
+ _(Preserve current assignments)_:
+
+
+
+
-
-:
-
- _(Array has been **Reset**)_ (_(please configure)_)
-
- _(Array must be **Stopped** to change)_
-
-
diff --git a/emhttp/plugins/dynamix/NewPerms.page b/emhttp/plugins/dynamix/NewPerms.page
index 3dc93c648..70f5726f2 100644
--- a/emhttp/plugins/dynamix/NewPerms.page
+++ b/emhttp/plugins/dynamix/NewPerms.page
@@ -91,36 +91,50 @@ Closing the window before completion will terminate the background process - so
Note that this tool may negatively affect any docker containers if you allow your **appdata** share to be included.
:end
-
diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page
index e74674f2f..da4a9cf20 100755
--- a/emhttp/plugins/dynamix/SecurityNFS.page
+++ b/emhttp/plugins/dynamix/SecurityNFS.page
@@ -31,7 +31,7 @@ _(Read settings from)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name) echo mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name) echo mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name) echo mk_option("", $list['name'], compress($list['name']));
}
?>
@@ -48,7 +48,7 @@ _(Write settings to)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name) $rows[] = mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name) $rows[] = mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name) $rows[] = mk_option("", $list['name'], compress($list['name']));
}
if ($rows) echo "";
foreach ($rows as $row) echo $row;
diff --git a/emhttp/plugins/dynamix/SecuritySMB.page b/emhttp/plugins/dynamix/SecuritySMB.page
index 7991090dd..de4af57b8 100755
--- a/emhttp/plugins/dynamix/SecuritySMB.page
+++ b/emhttp/plugins/dynamix/SecuritySMB.page
@@ -34,7 +34,7 @@ _(Read settings from)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name) echo mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name) echo mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name) echo mk_option("", $list['name'], compress($list['name']));
}
?>
@@ -51,7 +51,7 @@ _(Write settings to)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name) $rows[] = mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name) $rows[] = mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name) $rows[] = mk_option("", $list['name'], compress($list['name']));
}
if ($rows) echo "";
foreach ($rows as $row) echo $row;
@@ -154,7 +154,7 @@ _(Read settings from)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='secure') echo mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='secure') echo mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name && $sec[$list['name']]['security']=='secure') echo mk_option("", $list['name'], compress($list['name']));
}
?>
@@ -171,7 +171,7 @@ _(Write settings to)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='secure') $rows[] = mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='secure') $rows[] = mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name && $sec[$list['name']]['security']=='secure') $rows[] = mk_option("", $list['name'], compress($list['name']));
}
if ($rows) echo "";
foreach ($rows as $row) echo $row;
@@ -217,7 +217,7 @@ _(Read settings from)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='private') echo mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='private') echo mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name && $sec[$list['name']]['security']=='private') echo mk_option("", $list['name'], compress($list['name']));
}
?>
@@ -234,7 +234,7 @@ _(Write settings to)_
if (isset($disks[$name])) {
foreach (array_filter($disks,'clone_list') as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='private') $rows[] = mk_option("", $list['name'], _(my_disk($list['name']),3));
} else {
- foreach ($shares as $list) if ($list['name']!=$name && $sec[$list['name']]['security']=='private') $rows[] = mk_option("", $list['name'], compress($list['name']));
+ foreach ($shares as $list) if (strpos($list['name'],"'") === false && $list['name']!=$name && $sec[$list['name']]['security']=='private') $rows[] = mk_option("", $list['name'], compress($list['name']));
}
if ($rows) echo "";
foreach ($rows as $row) echo $row;
@@ -267,7 +267,7 @@ $(function() {
checkShareSettingsSMB(document.smb_edit);
initDropdownSMB(false);
- $('#tab'+$('input[name$="tabs"]').length).bind({click:function(){initDropdownSMB(true);}});
+ $('#tab'+$('.tabs-container button').length).bind({click:function(){initDropdownSMB(true);}});
toggleButton('readusersmb',true);
diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 73f9ec998..53cc9cde0 100755
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -327,7 +327,7 @@ function direction() {
$myDisks = array_filter(array_diff(array_keys(array_filter($disks,'my_disks')), explode(',',$var['shareUserExclude'])), 'globalInclude');
$filteredShares = array_filter($shares, function($list) use ($name) {
- return $list['name'] != $name || !$name;
+ return (strpos($list['name'],"'") === false) && ($list['name'] != $name || !$name) ;
});
?>
:share_edit_global1_help:
diff --git a/emhttp/plugins/dynamix/ShareSettings.page b/emhttp/plugins/dynamix/ShareSettings.page
index 346a63544..a61a05f00 100644
--- a/emhttp/plugins/dynamix/ShareSettings.page
+++ b/emhttp/plugins/dynamix/ShareSettings.page
@@ -28,6 +28,7 @@ $fileMax = (int) file_get_contents('/proc/sys/fs/file-max');
$(function() {
$('#s1').dropdownchecklist({emptyText:"_(All)_", width:, explicitClose:"..._(close)_"});
$('#s2').dropdownchecklist({emptyText:"_(None)_", width:, explicitClose:"..._(close)_"});
+ $('#s3').dropdownchecklist({emptyText:"_(None)_", width:, explicitClose:"..._(close)_"});
presetShare(document.share_settings);
});
@@ -47,6 +48,7 @@ async function prepareShare(form) {
item = form.shareUserInclude.options[0];
item.value = include;
item.selected = true;
+
var exclude = '';
for (var i=0,item; item=form.shareUserExclude.options[i]; i++) {
if (item.selected) {
@@ -59,6 +61,18 @@ async function prepareShare(form) {
item.value = exclude;
item.selected = true;
+ var emptying = '';
+ for (var i=0,item; item=form.shareUserEmptying.options[i]; i++) {
+ if (item.selected) {
+ if (emptying.length) emptying += ',';
+ emptying += item.value;
+ item.selected = false;
+ }
+ }
+ item = form.shareUserEmptying.options[0];
+ item.value = emptying;
+ item.selected = true;
+
/* Validate file count input against fileMax */
try {
const fileCountInput = form.querySelector('#file_count');
@@ -87,8 +101,10 @@ function presetShare(form,shares) {
var onOff = disabled ? 'disable':'enable';
form.shareUserInclude.disabled = disabled;
form.shareUserExclude.disabled = disabled;
+ form.shareUserEmptying.disabled = disabled;
$('#s1').dropdownchecklist(onOff);
$('#s2').dropdownchecklist(onOff);
+ $('#s3').dropdownchecklist(onOff);
}
diff --git a/emhttp/plugins/dynamix/include/publish.php b/emhttp/plugins/dynamix/include/publish.php
index 880f941f6..b50ff0286 100755
--- a/emhttp/plugins/dynamix/include/publish.php
+++ b/emhttp/plugins/dynamix/include/publish.php
@@ -83,7 +83,6 @@ function publish($endpoint, $message, $len=1, $abort=false, $abortTime=30) {
$abortStart[$endpoint] = time();
if ( (time() - $abortStart[$endpoint]) > $abortTime) {
$script = removeNChanScript();
- my_logger("$script timed out after $abortTime seconds. Exiting.", 'publish');
exit();
}
$reply = false; // if no subscribers, force return value to false
diff --git a/emhttp/plugins/dynamix/include/timezones.key b/emhttp/plugins/dynamix/include/timezones.key
index a68c34e42..45db382ed 100644
--- a/emhttp/plugins/dynamix/include/timezones.key
+++ b/emhttp/plugins/dynamix/include/timezones.key
@@ -42,7 +42,7 @@ Europe/Athens|(UTC+02:00) Athens, Bucharest
Asia/Beirut|(UTC+02:00) Beirut
Africa/Cairo|(UTC+02:00) Cairo
Africa/Johannesburg|(UTC+02:00) Harare, Pretoria
-Europe/Kiev|(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius
+Europe/Kyiv|(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius
Europe/Istanbul|(UTC+02:00) Istanbul
Asia/Jerusalem|(UTC+02:00) Jerusalem
Asia/Baghdad|(UTC+03:00) Baghdad
diff --git a/emhttp/plugins/dynamix/include/update.wireguard.php b/emhttp/plugins/dynamix/include/update.wireguard.php
index 5454f393e..10edd7afd 100644
--- a/emhttp/plugins/dynamix/include/update.wireguard.php
+++ b/emhttp/plugins/dynamix/include/update.wireguard.php
@@ -541,8 +541,9 @@ case 'import':
$vpn = (in_array($default4,$vpn) || in_array($default6,$vpn)) ? 8 : 0;
if ($vpn==8) $import["Address:$n"] = '';
$import["TYPE:$n"] = $vpn;
- ipfilter(_var($import,"AllowedIPs:$n"));
- if (_var($import,"TYPE:$n") == 0) $var['subnets1'] = "AllowedIPs="._var($import,"AllowedIPs:$n");
+ $allowedIPs = _var($import, "AllowedIPs:$n");
+ ipfilter($allowedIPs);
+ if (_var($import,"TYPE:$n") == 0) $var['subnets1'] = "AllowedIPs=$allowedIPs";
}
foreach ($import as $key => $val) $sort[] = explode(':',$key)[1];
array_multisort($sort, $import);
diff --git a/emhttp/plugins/dynamix/javascript/dynamix.js b/emhttp/plugins/dynamix/javascript/dynamix.js
index 0293f6147..31059cd46 100644
--- a/emhttp/plugins/dynamix/javascript/dynamix.js
+++ b/emhttp/plugins/dynamix/javascript/dynamix.js
@@ -54,8 +54,8 @@ Q.find=(function(){var aP=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][
/* Modified by Andrew Zawadzki - Changed variable code to be codeAZ due to conflict with const code in vue */
shortcut={all_shortcuts:{},add:function(l,p,i){var e={type:"keydown",propagate:!1,disable_in_input:!1,target:document,keycode:!1};if(i)for(var t in e)void 0===i[t]&&(i[t]=e[t]);else i=e;var a=i.target;"string"==typeof i.target&&(a=document.getElementById(i.target));l=l.toLowerCase();function r(e){var t;if(e=e||window.event,!i.disable_in_input||(e.target?t=e.target:e.srcElement&&(t=e.srcElement),3==t.nodeType&&(t=t.parentNode),"INPUT"!=t.tagName&&"TEXTAREA"!=t.tagName)){e.keyCode?codeAZ=e.keyCode:e.which&&(codeAZ=e.which);var a=String.fromCharCode(codeAZ).toLowerCase();188==codeAZ&&(a=","),190==codeAZ&&(a=".");var r=l.split("+"),n=0,s={"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":":","'":'"',",":"<",".":">","/":"?","\\":"|"},o={esc:27,escape:27,tab:9,space:32,return:13,enter:13,backspace:8,scrolllock:145,scroll_lock:145,scroll:145,capslock:20,caps_lock:20,caps:20,numlock:144,num_lock:144,num:144,pause:19,break:19,insert:45,home:36,delete:46,end:35,pageup:33,page_up:33,pu:33,pagedown:34,page_down:34,pd:34,left:37,up:38,right:39,down:40,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},d={shift:{wanted:!1,pressed:!1},ctrl:{wanted:!1,pressed:!1},alt:{wanted:!1,pressed:!1},meta:{wanted:!1,pressed:!1}};e.ctrlKey&&(d.ctrl.pressed=!0),e.shiftKey&&(d.shift.pressed=!0),e.altKey&&(d.alt.pressed=!0),e.metaKey&&(d.meta.pressed=!0);for(var c=0;k=r[c],cRead More',lessLink:'Close',embedCSS:!0,sectionCSS:"display: block; width: 100%;",startOpen:!1,expandedClass:"readmore-js-expanded",collapsedClass:"readmore-js-collapsed",beforeToggle:function(){},afterToggle:function(){}},k=!1;g.prototype={init:function(){var b=this;c(this.element).each(function(){var a=c(this),d=a.css("max-height").replace(/[^-\d\.]/g,"")>a.data("max-height")?a.css("max-height").replace(/[^-\d\.]/g,""):a.data("max-height"),e=a.data("height-margin");"none"!=a.css("max-height")&&a.css("max-height","none");b.setBoxHeight(a);if(a.outerHeight(!0)<=d+e)return!0;a.addClass("readmore-js-section "+b.options.collapsedClass).data("collapsedHeight",d);a.after(c(b.options.startOpen?b.options.lessLink:b.options.moreLink).on("click",function(c){b.toggleSlider(this,a,c)}).addClass("readmore-js-toggle"));b.options.startOpen||a.css({height:d})});c(window).on("resize",function(a){b.resizeBoxes()})},toggleSlider:function(b,a,d){d.preventDefault();var e=this;d=newLink=sectionClass="";var f=!1;d=c(a).data("collapsedHeight");c(a).height()<=d?(d=c(a).data("expandedHeight")+"px",newLink="lessLink",f=!0,sectionClass=e.options.expandedClass):(newLink="moreLink",sectionClass=e.options.collapsedClass);e.options.beforeToggle(b,a,f);c(a).animate({height:d},{duration:e.options.speed,complete:function(){e.options.afterToggle(b,a,f);c(b).replaceWith(c(e.options[newLink]).on("click",function(b){e.toggleSlider(this,a,b)}).addClass("readmore-js-toggle"));c(this).removeClass(e.options.collapsedClass+" "+e.options.expandedClass).addClass(sectionClass)}})},setBoxHeight:function(b){var a=b.clone().css({height:"auto",width:b.width(),overflow:"hidden"}).insertAfter(b),c=a.outerHeight(!0);a.remove();b.data("expandedHeight",c)},resizeBoxes:function(){var b=this;c(".readmore-js-section").each(function(){var a=c(this);b.setBoxHeight(a);(a.height()>a.data("expandedHeight")||a.hasClass(b.options.expandedClass)&&a.height()Read More',lessLink:'Close',embedCSS:!0,sectionCSS:"display: block; width: 100%;",startOpen:!1,expandedClass:"readmore-js-expanded",collapsedClass:"readmore-js-collapsed",beforeToggle:function(){},afterToggle:function(){}},k=!1,resizeTimer=null,measuredHeights=new WeakMap();g.prototype={init:function(){var b=this;c(this.element).each(function(){var a=c(this);if(a.hasClass("readmore-js-section")){return}var d=a.css("max-height").replace(/[^-\d\.]/g,"")>a.data("max-height")?a.css("max-height").replace(/[^-\d\.]/g,""):a.data("max-height"),e=a.data("height-margin");"none"!=a.css("max-height")&&a.css("max-height","none");a.css({height:"auto",overflow:"visible"});var expandedHeight=a.outerHeight(!0);if(expandedHeight<=d+e){a.css({height:"",overflow:""});return!0}a.addClass("readmore-js-section "+b.options.collapsedClass).data("collapsedHeight",d).data("expandedHeight",expandedHeight);if(!b.options.startOpen){a.css({height:d+"px",overflow:"hidden"})}else{a.css({height:expandedHeight+"px"})}var toggle=c(b.options.startOpen?b.options.lessLink:b.options.moreLink).on("click",function(c){b.toggleSlider(this,a,c)}).addClass("readmore-js-toggle");a.after(toggle)});c(window).off("resize.readmore").on("resize.readmore",function(a){clearTimeout(resizeTimer);resizeTimer=setTimeout(function(){b.resizeBoxes()},250)})},toggleSlider:function(b,a,d){d.preventDefault();var e=this;var collapsed=a.hasClass(e.options.collapsedClass);var newHeight=collapsed?a.data("expandedHeight"):a.data("collapsedHeight");if(!newHeight||newHeight==0){a.css({height:"auto",overflow:"visible"});newHeight=collapsed?a.outerHeight(!0):a.data("collapsedHeight");if(collapsed)a.data("expandedHeight",newHeight)}var newLink=collapsed?e.options.lessLink:e.options.moreLink;var sectionClass=collapsed?e.options.expandedClass:e.options.collapsedClass;e.options.beforeToggle(b,a,collapsed);a.css({height:newHeight+"px",overflow:collapsed?"visible":"hidden"});a.removeClass(e.options.collapsedClass+" "+e.options.expandedClass).addClass(sectionClass);var newToggle=c(newLink).on("click",function(c){e.toggleSlider(this,a,c)}).addClass("readmore-js-toggle");c(b).replaceWith(newToggle);e.options.afterToggle(b,a,collapsed)},resizeBoxes:function(){var b=this;c(".readmore-js-section").each(function(){var a=c(this);a.css({height:"auto",overflow:"visible"});var expandedHeight=a.outerHeight(!0);a.data("expandedHeight",expandedHeight);if(a.hasClass(b.options.expandedClass)){a.css({height:expandedHeight+"px"})}else if(a.hasClass(b.options.collapsedClass)){a.css({height:a.data("collapsedHeight")+"px",overflow:"hidden"})}})},destroy:function(){var b=this;c(window).off("resize.readmore");c(this.element).each(function(){var a=c(this);a.removeClass("readmore-js-section "+b.options.collapsedClass+" "+b.options.expandedClass).css({"max-height":"",height:"",overflow:""}).next(".readmore-js-toggle").remove();a.removeData();measuredHeights.delete(a[0])})}};c.fn[f]=function(b){var a=arguments;if(void 0===b||"object"===typeof b)return this.each(function(){if(c.data(this,"plugin_"+f)){var a=c.data(this,"plugin_"+f);a.destroy.apply(a)}c.data(this,"plugin_"+f,new g(this,b))});if("string"===typeof b&&"_"!==b[0]&&"init"!==b)return this.each(function(){var d=c.data(this,"plugin_"+f);d instanceof g&&"function"===typeof d[b]&&d[b].apply(d,Array.prototype.slice.call(a,1))})}})(jQuery);
/**
* Simple, lightweight, usable local autocomplete library for modern browsers
* Because there weren’t enough autocomplete scripts in the world? Because I’m completely insane and have NIH syndrome? Probably both. :P
diff --git a/emhttp/plugins/dynamix/javascript/smoothie.js b/emhttp/plugins/dynamix/javascript/smoothie.js
new file mode 100644
index 000000000..2af8f1580
--- /dev/null
+++ b/emhttp/plugins/dynamix/javascript/smoothie.js
@@ -0,0 +1,1176 @@
+;(function(exports) {
+
+/**
+ * @license
+ * MIT License:
+ *
+ * Copyright (c) 2010-2013, Joe Walnes
+ * 2013-2018, Drew Noakes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Smoothie Charts - http://smoothiecharts.org/
+ * (c) 2010-2013, Joe Walnes
+ * 2013-2018, Drew Noakes
+ *
+ * v1.0: Main charting library, by Joe Walnes
+ * v1.1: Auto scaling of axis, by Neil Dunn
+ * v1.2: fps (frames per second) option, by Mathias Petterson
+ * v1.3: Fix for divide by zero, by Paul Nikitochkin
+ * v1.4: Set minimum, top-scale padding, remove timeseries, add optional timer to reset bounds, by Kelley Reynolds
+ * v1.5: Set default frames per second to 50... smoother.
+ * .start(), .stop() methods for conserving CPU, by Dmitry Vyal
+ * options.interpolation = 'bezier' or 'line', by Dmitry Vyal
+ * options.maxValue to fix scale, by Dmitry Vyal
+ * v1.6: minValue/maxValue will always get converted to floats, by Przemek Matylla
+ * v1.7: options.grid.fillStyle may be a transparent color, by Dmitry A. Shashkin
+ * Smooth rescaling, by Kostas Michalopoulos
+ * v1.8: Set max length to customize number of live points in the dataset with options.maxDataSetLength, by Krishna Narni
+ * v1.9: Display timestamps along the bottom, by Nick and Stev-io
+ * (https://groups.google.com/forum/?fromgroups#!topic/smoothie-charts/-Ywse8FCpKI%5B1-25%5D)
+ * Refactored by Krishna Narni, to support timestamp formatting function
+ * v1.10: Switch to requestAnimationFrame, removed the now obsoleted options.fps, by Gergely Imreh
+ * v1.11: options.grid.sharpLines option added, by @drewnoakes
+ * Addressed warning seen in Firefox when seriesOption.fillStyle undefined, by @drewnoakes
+ * v1.12: Support for horizontalLines added, by @drewnoakes
+ * Support for yRangeFunction callback added, by @drewnoakes
+ * v1.13: Fixed typo (#32), by @alnikitich
+ * v1.14: Timer cleared when last TimeSeries removed (#23), by @davidgaleano
+ * Fixed diagonal line on chart at start/end of data stream, by @drewnoakes
+ * v1.15: Support for npm package (#18), by @dominictarr
+ * Fixed broken removeTimeSeries function (#24) by @davidgaleano
+ * Minor performance and tidying, by @drewnoakes
+ * v1.16: Bug fix introduced in v1.14 relating to timer creation/clearance (#23), by @drewnoakes
+ * TimeSeries.append now deals with out-of-order timestamps, and can merge duplicates, by @zacwitte (#12)
+ * Documentation and some local variable renaming for clarity, by @drewnoakes
+ * v1.17: Allow control over font size (#10), by @drewnoakes
+ * Timestamp text won't overlap, by @drewnoakes
+ * v1.18: Allow control of max/min label precision, by @drewnoakes
+ * Added 'borderVisible' chart option, by @drewnoakes
+ * Allow drawing series with fill but no stroke (line), by @drewnoakes
+ * v1.19: Avoid unnecessary repaints, and fixed flicker in old browsers having multiple charts in document (#40), by @asbai
+ * v1.20: Add SmoothieChart.getTimeSeriesOptions and SmoothieChart.bringToFront functions, by @drewnoakes
+ * v1.21: Add 'step' interpolation mode, by @drewnoakes
+ * v1.22: Add support for different pixel ratios. Also add optional y limit formatters, by @copacetic
+ * v1.23: Fix bug introduced in v1.22 (#44), by @drewnoakes
+ * v1.24: Fix bug introduced in v1.23, re-adding parseFloat to y-axis formatter defaults, by @siggy_sf
+ * v1.25: Fix bug seen when adding a data point to TimeSeries which is older than the current data, by @Nking92
+ * Draw time labels on top of series, by @comolosabia
+ * Add TimeSeries.clear function, by @drewnoakes
+ * v1.26: Add support for resizing on high device pixel ratio screens, by @copacetic
+ * v1.27: Fix bug introduced in v1.26 for non whole number devicePixelRatio values, by @zmbush
+ * v1.28: Add 'minValueScale' option, by @megawac
+ * Fix 'labelPos' for different size of 'minValueString' 'maxValueString', by @henryn
+ * v1.29: Support responsive sizing, by @drewnoakes
+ * v1.29.1: Include types in package, and make property optional, by @TrentHouliston
+ * v1.30: Fix inverted logic in devicePixelRatio support, by @scanlime
+ * v1.31: Support tooltips, by @Sly1024 and @drewnoakes
+ * v1.32: Support frame rate limit, by @dpuyosa
+ * v1.33: Use Date static method instead of instance, by @nnnoel
+ * Fix bug with tooltips when multiple charts on a page, by @jpmbiz70
+ * v1.34: Add disabled option to TimeSeries, by @TechGuard (#91)
+ * Add nonRealtimeData option, by @annazhelt (#92, #93)
+ * Add showIntermediateLabels option, by @annazhelt (#94)
+ * Add displayDataFromPercentile option, by @annazhelt (#95)
+ * Fix bug when hiding tooltip element, by @ralphwetzel (#96)
+ * Support intermediate y-axis labels, by @beikeland (#99)
+ * v1.35: Fix issue with responsive mode at high DPI, by @drewnoakes (#101)
+ * v1.36: Add tooltipLabel to ITimeSeriesPresentationOptions.
+ * If tooltipLabel is present, tooltipLabel displays inside tooltip
+ * next to value, by @jackdesert (#102)
+ * Fix bug rendering issue in series fill when using scroll backwards, by @olssonfredrik
+ * Add title option, by @mesca
+ * Fix data drop stoppage by rejecting NaNs in append(), by @timdrysdale
+ * Allow setting interpolation per time series, by @WofWca (#123)
+ * Fix chart constantly jumping in 1-2 pixel steps, by @WofWca (#131)
+ * Fix a memory leak appearing when some `timeSeries.disabled === true`, by @WofWca (#132)
+ * Fix: make all lines sharp, remove the `grid.sharpLines` option by @WofWca (#134)
+ * Improve performance, by @WofWca (#135)
+ * Fix `this.delay` not being respected with `nonRealtimeData: true`, by @WofWca (#137)
+ * Fix series fill & stroke being inconsistent for last data time < render time, by @WofWca (#138)
+ * v1.36.1: Fix a potential XSS when `tooltipLabel` or `strokeStyle` are controlled by users, by @WofWca
+ * v1.36.2: fix: 1px lines jumping 1px left and right at rational `millisPerPixel`, by @WofWca
+ * perf: improve `render()` performane a bit, by @WofWca
+ * v1.37: Add `fillToBottom` option to fill timeSeries to 0 instead of to the bottom of the canvas, by @socketpair & @WofWca (#140)
+ */
+
+ // Date.now polyfill
+ Date.now = Date.now || function() { return new Date().getTime(); };
+
+ var Util = {
+ extend: function() {
+ arguments[0] = arguments[0] || {};
+ for (var i = 1; i < arguments.length; i++)
+ {
+ for (var key in arguments[i])
+ {
+ if (arguments[i].hasOwnProperty(key))
+ {
+ if (typeof(arguments[i][key]) === 'object') {
+ if (arguments[i][key] instanceof Array) {
+ arguments[0][key] = arguments[i][key];
+ } else {
+ arguments[0][key] = Util.extend(arguments[0][key], arguments[i][key]);
+ }
+ } else {
+ arguments[0][key] = arguments[i][key];
+ }
+ }
+ }
+ }
+ return arguments[0];
+ },
+ binarySearch: function(data, value) {
+ var low = 0,
+ high = data.length;
+ while (low < high) {
+ var mid = (low + high) >> 1;
+ if (value < data[mid][0])
+ high = mid;
+ else
+ low = mid + 1;
+ }
+ return low;
+ },
+ // So lines (especially vertical and horizontal) look a) consistent along their length and b) sharp.
+ pixelSnap: function(position, lineWidth) {
+ if (lineWidth % 2 === 0) {
+ // Closest pixel edge.
+ return Math.round(position);
+ } else {
+ // Closest pixel center.
+ return Math.floor(position) + 0.5;
+ }
+ },
+ };
+
+ /**
+ * Initialises a new TimeSeries with optional data options.
+ *
+ * Options are of the form (defaults shown):
+ *
+ *
+ * {
+ * resetBounds: true, // enables/disables automatic scaling of the y-axis
+ * resetBoundsInterval: 3000 // the period between scaling calculations, in millis
+ * }
+ *
+ *
+ * Presentation options for TimeSeries are specified as an argument to SmoothieChart.addTimeSeries.
+ *
+ * @constructor
+ */
+ function TimeSeries(options) {
+ this.options = Util.extend({}, TimeSeries.defaultOptions, options);
+ this.disabled = false;
+ this.clear();
+ }
+
+ TimeSeries.defaultOptions = {
+ resetBoundsInterval: 3000,
+ resetBounds: true
+ };
+
+ /**
+ * Clears all data and state from this TimeSeries object.
+ */
+ TimeSeries.prototype.clear = function() {
+ this.data = [];
+ this.maxValue = Number.NaN; // The maximum value ever seen in this TimeSeries.
+ this.minValue = Number.NaN; // The minimum value ever seen in this TimeSeries.
+ };
+
+ /**
+ * Recalculate the min/max values for this TimeSeries object.
+ *
+ * This causes the graph to scale itself in the y-axis.
+ */
+ TimeSeries.prototype.resetBounds = function() {
+ if (this.data.length) {
+ // Walk through all data points, finding the min/max value
+ this.maxValue = this.data[0][1];
+ this.minValue = this.data[0][1];
+ for (var i = 1; i < this.data.length; i++) {
+ var value = this.data[i][1];
+ if (value > this.maxValue) {
+ this.maxValue = value;
+ }
+ if (value < this.minValue) {
+ this.minValue = value;
+ }
+ }
+ } else {
+ // No data exists, so set min/max to NaN
+ this.maxValue = Number.NaN;
+ this.minValue = Number.NaN;
+ }
+ };
+
+ /**
+ * Adds a new data point to the TimeSeries, preserving chronological order.
+ *
+ * @param timestamp the position, in time, of this data point
+ * @param value the value of this data point
+ * @param sumRepeatedTimeStampValues if timestamp has an exact match in the series, this flag controls
+ * whether it is replaced, or the values summed (defaults to false.)
+ */
+ TimeSeries.prototype.append = function(timestamp, value, sumRepeatedTimeStampValues) {
+ // Reject NaN
+ if (isNaN(timestamp) || isNaN(value)){
+ return
+ }
+
+ var lastI = this.data.length - 1;
+ if (lastI >= 0) {
+ // Rewind until we find the place for the new data
+ var i = lastI;
+ while (true) {
+ var iThData = this.data[i];
+ if (timestamp >= iThData[0]) {
+ if (timestamp === iThData[0]) {
+ // Update existing values in the array
+ if (sumRepeatedTimeStampValues) {
+ // Sum this value into the existing 'bucket'
+ iThData[1] += value;
+ value = iThData[1];
+ } else {
+ // Replace the previous value
+ iThData[1] = value;
+ }
+ } else {
+ // Splice into the correct position to keep timestamps in order
+ this.data.splice(i + 1, 0, [timestamp, value]);
+ }
+
+ break;
+ }
+
+ i--;
+ if (i < 0) {
+ // This new item is the oldest data
+ this.data.splice(0, 0, [timestamp, value]);
+
+ break;
+ }
+ }
+ } else {
+ // It's the first element
+ this.data.push([timestamp, value]);
+ }
+
+ this.maxValue = isNaN(this.maxValue) ? value : Math.max(this.maxValue, value);
+ this.minValue = isNaN(this.minValue) ? value : Math.min(this.minValue, value);
+ };
+
+ TimeSeries.prototype.dropOldData = function(oldestValidTime, maxDataSetLength) {
+ // We must always keep one expired data point as we need this to draw the
+ // line that comes into the chart from the left, but any points prior to that can be removed.
+ var removeCount = 0;
+ while (this.data.length - removeCount >= maxDataSetLength && this.data[removeCount + 1][0] < oldestValidTime) {
+ removeCount++;
+ }
+ if (removeCount !== 0) {
+ this.data.splice(0, removeCount);
+ }
+ };
+
+ /**
+ * Initialises a new SmoothieChart.
+ *
+ * Options are optional, and should be of the form below. Just specify the values you
+ * need and the rest will be given sensible defaults as shown:
+ *
+ *
+ * {
+ * minValue: undefined, // specify to clamp the lower y-axis to a given value
+ * maxValue: undefined, // specify to clamp the upper y-axis to a given value
+ * maxValueScale: 1, // allows proportional padding to be added above the chart. for 10% padding, specify 1.1.
+ * minValueScale: 1, // allows proportional padding to be added below the chart. for 10% padding, specify 1.1.
+ * yRangeFunction: undefined, // function({min: , max: }) { return {min: , max: }; }
+ * scaleSmoothing: 0.125, // controls the rate at which y-value zoom animation occurs
+ * millisPerPixel: 20, // sets the speed at which the chart pans by
+ * enableDpiScaling: true, // support rendering at different DPI depending on the device
+ * yMinFormatter: function(min, precision) { // callback function that formats the min y value label
+ * return parseFloat(min).toFixed(precision);
+ * },
+ * yMaxFormatter: function(max, precision) { // callback function that formats the max y value label
+ * return parseFloat(max).toFixed(precision);
+ * },
+ * yIntermediateFormatter: function(intermediate, precision) { // callback function that formats the intermediate y value labels
+ * return parseFloat(intermediate).toFixed(precision);
+ * },
+ * maxDataSetLength: 2,
+ * interpolation: 'bezier' // one of 'bezier', 'linear', or 'step'
+ * timestampFormatter: null, // optional function to format time stamps for bottom of chart
+ * // you may use SmoothieChart.timeFormatter, or your own: function(date) { return ''; }
+ * scrollBackwards: false, // reverse the scroll direction of the chart
+ * horizontalLines: [], // [ { value: 0, color: '#ffffff', lineWidth: 1 } ]
+ * grid:
+ * {
+ * fillStyle: '#000000', // the background colour of the chart
+ * lineWidth: 1, // the pixel width of grid lines
+ * strokeStyle: '#777777', // colour of grid lines
+ * millisPerLine: 1000, // distance between vertical grid lines
+ * verticalSections: 2, // number of vertical sections marked out by horizontal grid lines
+ * borderVisible: true // whether the grid lines trace the border of the chart or not
+ * },
+ * labels
+ * {
+ * disabled: false, // enables/disables labels showing the min/max values
+ * fillStyle: '#ffffff', // colour for text of labels,
+ * fontSize: 15,
+ * fontFamily: 'sans-serif',
+ * precision: 2,
+ * showIntermediateLabels: false, // shows intermediate labels between min and max values along y axis
+ * intermediateLabelSameAxis: true,
+ * },
+ * title
+ * {
+ * text: '', // the text to display on the left side of the chart
+ * fillStyle: '#ffffff', // colour for text
+ * fontSize: 15,
+ * fontFamily: 'sans-serif',
+ * verticalAlign: 'middle' // one of 'top', 'middle', or 'bottom'
+ * },
+ * tooltip: false // show tooltip when mouse is over the chart
+ * tooltipLine: { // properties for a vertical line at the cursor position
+ * lineWidth: 1,
+ * strokeStyle: '#BBBBBB'
+ * },
+ * tooltipFormatter: SmoothieChart.tooltipFormatter, // formatter function for tooltip text
+ * nonRealtimeData: false, // use time of latest data as current time
+ * displayDataFromPercentile: 1, // display not latest data, but data from the given percentile
+ * // useful when trying to see old data saved by setting a high value for maxDataSetLength
+ * // should be a value between 0 and 1
+ * responsive: false, // whether the chart should adapt to the size of the canvas
+ * limitFPS: 0 // maximum frame rate the chart will render at, in FPS (zero means no limit)
+ * }
+ *