Skip to content

Commit 65c0524

Browse files
ktsaouktsaou
committed
a more usable alarms log
1 parent 4d02f60 commit 65c0524

7 files changed

Lines changed: 1894 additions & 54 deletions

File tree

‎LICENSE.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,15 @@ connectivity is not available.
147147

148148
Copyright 2006, Kirill Simonov
149149
[MIT License](http://pyyaml.org)
150+
151+
- [bootstrap-table](http://bootstrap-table.wenzhixin.net.cn/)
152+
153+
Copyright (c) 2012-2016 Zhixin Wen <wenzhixin2010@gmail.com>
154+
[MIT License](https://github.com/wenzhixin/bootstrap-table/blob/master/LICENSE)
155+
156+
- [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jquery.plugin)
157+
158+
Copyright (c) 2015,2016 hhurz
159+
[MIT License](http://rawgit.com/hhurz/tableExport.jquery.plugin/master/tableExport.js)
160+
161+

‎web/Makefile.am‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,19 @@ dist_webold_DATA = \
3434

3535
weblibdir=$(webdir)/lib
3636
dist_weblib_DATA = \
37+
lib/bootstrap-3.3.7.min.js \
38+
lib/bootstrap-table.min.js \
39+
lib/bootstrap-table-export.min.js \
40+
lib/tableExport.js \
3741
lib/dygraph-combined-f6ec7be.js \
3842
lib/dygraph-smooth-plotter.js \
3943
lib/jquery-3.1.1.min.js \
4044
lib/jquery.peity.min.js \
4145
lib/jquery.sparkline.min.js \
42-
lib/morris.min.js \
43-
lib/raphael-min.js \
4446
lib/jquery.easypiechart.min.js \
4547
lib/jquery.nanoscroller.min.js \
46-
lib/bootstrap-3.3.7.min.js \
48+
lib/morris.min.js \
49+
lib/raphael-min.js \
4750
lib/ElementQueries.js \
4851
lib/ResizeSensor.js \
4952
lib/bootstrap-toggle.min.js \

‎web/dashboard.js‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5579,6 +5579,7 @@
55795579
NETDATA.requiredJs = [
55805580
{
55815581
url: NETDATA.serverDefault + 'lib/bootstrap-3.3.7.min.js',
5582+
async: false,
55825583
isAlreadyLoaded: function() {
55835584
// check if bootstrap is loaded
55845585
if(typeof $().emulateTransitionEnd == 'function')
@@ -5594,10 +5595,6 @@
55945595
{
55955596
url: NETDATA.serverDefault + 'lib/jquery.nanoscroller.min.js',
55965597
isAlreadyLoaded: function() { return false; }
5597-
},
5598-
{
5599-
url: NETDATA.serverDefault + 'lib/bootstrap-toggle.min.js',
5600-
isAlreadyLoaded: function() { return false; }
56015598
}
56025599
];
56035600

@@ -5627,7 +5624,11 @@
56275624

56285625
NETDATA.loadedRequiredJs = 0;
56295626
NETDATA.loadRequiredJs = function(index, callback) {
5630-
if(index >= NETDATA.requiredJs.length) return;
5627+
if(index >= NETDATA.requiredJs.length) {
5628+
if(typeof callback === 'function')
5629+
callback();
5630+
return;
5631+
}
56315632

56325633
if(NETDATA.requiredJs[index].isAlreadyLoaded()) {
56335634
NETDATA.loadedRequiredJs++;
@@ -5638,10 +5639,13 @@
56385639
if(NETDATA.options.debug.main_loop === true)
56395640
console.log('loading ' + NETDATA.requiredJs[index].url);
56405641

5642+
var async = true;
5643+
if(typeof NETDATA.requiredJs[index].async !== 'undefined' && NETDATA.requiredJs[index].async === false)
5644+
async = false;
5645+
56415646
$.ajax({
56425647
url: NETDATA.requiredJs[index].url,
56435648
cache: true,
5644-
async: true,
56455649
dataType: "script",
56465650
xhrFields: { withCredentials: true } // required for the cookie
56475651
})
@@ -5654,11 +5658,13 @@
56545658
})
56555659
.always(function() {
56565660
NETDATA.loadedRequiredJs++;
5657-
if(typeof callback === 'function' && NETDATA.loadedRequiredJs >= NETDATA.requiredJs.length)
5658-
callback();
5661+
5662+
if(async === false)
5663+
NETDATA.loadRequiredJs(++index, callback);
56595664
})
56605665

5661-
NETDATA.loadRequiredJs(++index, callback);
5666+
if(async === true)
5667+
NETDATA.loadRequiredJs(++index, callback);
56625668
};
56635669

56645670
NETDATA.loadRequiredCSS = function(index) {

0 commit comments

Comments
 (0)