restore jump to start from the alarms modal
Costa Tsaousis (ktsaou) committed
Dec 12, 2017 at 22:45 UTC
49d310873175ecf1cd1c3ad5ed60b2f8a3f52b9b
1 file changed
+13
-2
web/index.html
+13
-2
@@ -2137,7 +2137,7 @@
2137
2138
var has_alarm = (typeof alarm.warn !== 'undefined' || typeof alarm.crit !== 'undefined');
2139
2140
- var role_href = ((has_alarm === true)?('<br/> <br/>role: <b>' + alarm.recipient + '</b><br/> <br/><b><i class="fas fa-chart-line"></i></b><small> <a href="#" onClick="NETDATA.alarms.scrollToChart(\'' + alarm.chart + '\'); $(\'#alarmsModal\').modal(\'hide\'); return false;">jump to chart</a></small>'):(' '));
2140
+ var role_href = ((has_alarm === true)?('<br/> <br/>role: <b>' + alarm.recipient + '</b><br/> <br/><b><i class="fas fa-chart-line"></i></b><small> <a href="#" onClick="scrollToChartAfterHidingModal(\'' + alarm.chart + '\'); $(\'#alarmsModal\').modal(\'hide\'); return false;">jump to chart</a></small>'):(' '));
2141
2142
var html = '<tr><td class="text-center" style="vertical-align:middle" width="40%"><b>' + alarm.chart + '</b><br/> <br/><embed src="' + NETDATA.alarms.server + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" height="20"/><br/> <br/><span style="font-size: 18px">' + alarm.info + '</span>' + role_href + '</td>'
2143
+ '<td><table class="table">'
@@ -3796,6 +3796,13 @@
3796
}
3797
}
3798
3799
+ var modalHiddenCallback = null;
3800
+ function scrollToChartAfterHidingModal(chart) {
3801
+ modalHiddenCallback = function() {
3802
+ NETDATA.alarms.scrollToChart(chart);
3803
+ };
3804
+ }
3805
+
3806
var runOnceOnDashboardLastRun = 0;
3807
function runOnceOnDashboardWithjQuery() {
3808
if(runOnceOnDashboardLastRun !== 0) {
@@ -3880,10 +3887,14 @@
3887
.on('hidden.bs.modal', function () {
3888
if(modal_depth === 0)
3889
modal_shown = false;
3890
+
3891
+ if(typeof modalHiddenCallback === 'function')
3892
+ modalHiddenCallback();
3893
+
3894
+ modalHiddenCallback = null;
3895
//console.log(urlOptions.after);
3896
});
3897
3886
-
3898
// ------------------------------------------------------------------------
3899
// sidebar / affix
3900