Skip to content

Commit 63e72bc

Browse files
ktsaouktsaou
committed
updated all javascript libraries; added version on all files (when possible)
1 parent b5031f3 commit 63e72bc

33 files changed

Lines changed: 114 additions & 2125 deletions

‎LICENSE.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ connectivity is not available.
6767
[MIT License](https://github.com/minhur/bootstrap-toggle/blob/master/LICENSE)
6868

6969

70-
- [CSS Element Queries](https://github.com/marcj/css-element-queries)
71-
72-
Copyright Marc J. Schmidt
73-
[MIT License](https://github.com/marcj/css-element-queries/blob/master/LICENSE)
74-
75-
7670
- [AVL C Library](http://freecode.com/projects/avl)
7771

7872
Copyright 2000, Daniel Nagy, Budapest University of Technology and Economics

‎web/Makefile.am‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,33 @@ dist_webold_DATA = \
3535
weblibdir=$(webdir)/lib
3636
dist_weblib_DATA = \
3737
lib/bootstrap-3.3.7.min.js \
38-
lib/bootstrap-table.min.js \
39-
lib/bootstrap-table-export.min.js \
40-
lib/tableExport.js \
38+
lib/bootstrap-table-1.11.0.min.js \
39+
lib/bootstrap-table-export-1.11.0.min.js \
40+
lib/bootstrap-toggle-2.2.2.min.js \
41+
lib/c3-0.4.11.min.js \
42+
lib/d3-4.2.6.min.js \
4143
lib/dygraph-combined-f6ec7be.js \
42-
lib/dygraph-smooth-plotter.js \
44+
lib/dygraph-smooth-plotter-f6ec7be.js \
45+
lib/gauge-c27b989.min.js \
4346
lib/jquery-3.1.1.min.js \
44-
lib/jquery.peity.min.js \
45-
lib/jquery.sparkline.min.js \
46-
lib/jquery.easypiechart.min.js \
47-
lib/jquery.nanoscroller.min.js \
48-
lib/morris.min.js \
49-
lib/raphael-min.js \
50-
lib/ElementQueries.js \
51-
lib/ResizeSensor.js \
52-
lib/bootstrap-toggle.min.js \
53-
lib/c3.min.js \
54-
lib/d3.min.js \
55-
lib/gauge.min.js \
47+
lib/jquery.easypiechart-97b5824.min.js \
48+
lib/jquery.nanoscroller-0.8.7.min.js \
49+
lib/jquery.peity-3.2.0.min.js \
50+
lib/jquery.sparkline-2.1.2.min.js \
51+
lib/morris-0.5.1.min.js \
52+
lib/raphael-2.2.4-min.js \
53+
lib/tableExport-1.6.0.min.js \
5654
$(NULL)
5755

5856
webcssdir=$(webdir)/css
5957
dist_webcss_DATA = \
60-
css/morris.css \
58+
css/morris-0.5.1.css \
6159
css/bootstrap-3.3.7.min.css \
6260
css/bootstrap-theme-3.3.7.min.css \
6361
css/bootstrap.slate.min.css \
62+
css/bootstrap-toggle-2.2.2.min.css \
6463
css/font-awesome.min.css \
65-
css/bootstrap-toggle.min.css \
66-
css/c3.min.css \
64+
css/c3-0.4.11.min.css \
6765
$(NULL)
6866

6967
webfontsdir=$(webdir)/fonts

‎web/css/bootstrap-3.3.7.min.css‎

100755100644
File mode changed.

‎web/css/bootstrap-theme-3.3.7.min.css‎

100755100644
File mode changed.

web/css/bootstrap-toggle.min.css renamed to web/css/bootstrap-toggle-2.2.2.min.css

File renamed without changes.

web/css/morris.css renamed to web/css/morris-0.5.1.css

File renamed without changes.

‎web/dashboard.js‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,24 @@
109109
// make them RELATIVE so that the whole thing can also be
110110
// installed under a web server
111111
NETDATA.jQuery = NETDATA.serverDefault + 'lib/jquery-3.1.1.min.js';
112-
NETDATA.peity_js = NETDATA.serverDefault + 'lib/jquery.peity.min.js';
113-
NETDATA.sparkline_js = NETDATA.serverDefault + 'lib/jquery.sparkline.min.js';
114-
NETDATA.easypiechart_js = NETDATA.serverDefault + 'lib/jquery.easypiechart.min.js';
115-
NETDATA.gauge_js = NETDATA.serverDefault + 'lib/gauge.min.js';
112+
NETDATA.peity_js = NETDATA.serverDefault + 'lib/jquery.peity-3.2.0.min.js';
113+
NETDATA.sparkline_js = NETDATA.serverDefault + 'lib/jquery.sparkline-2.1.2.min.js';
114+
NETDATA.easypiechart_js = NETDATA.serverDefault + 'lib/jquery.easypiechart-97b5824.min.js';
115+
NETDATA.gauge_js = NETDATA.serverDefault + 'lib/gauge-c27b989.min.js';
116116
NETDATA.dygraph_js = NETDATA.serverDefault + 'lib/dygraph-combined-f6ec7be.js';
117-
NETDATA.dygraph_smooth_js = NETDATA.serverDefault + 'lib/dygraph-smooth-plotter.js';
118-
NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-min.js';
119-
NETDATA.morris_js = NETDATA.serverDefault + 'lib/morris.min.js';
120-
NETDATA.d3_js = NETDATA.serverDefault + 'lib/d3.min.js';
121-
NETDATA.c3_js = NETDATA.serverDefault + 'lib/c3.min.js';
122-
NETDATA.c3_css = NETDATA.serverDefault + 'css/c3.min.css';
123-
NETDATA.morris_css = NETDATA.serverDefault + 'css/morris.css';
117+
NETDATA.dygraph_smooth_js = NETDATA.serverDefault + 'lib/dygraph-smooth-plotter-f6ec7be.js';
118+
NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-2.2.4-min.js';
119+
NETDATA.c3_js = NETDATA.serverDefault + 'lib/c3-0.4.11.min.js';
120+
NETDATA.c3_css = NETDATA.serverDefault + 'css/c3-0.4.11.min.css';
121+
NETDATA.d3_js = NETDATA.serverDefault + 'lib/d3-4.2.6.min.js';
122+
NETDATA.morris_js = NETDATA.serverDefault + 'lib/morris-0.5.1.min.js';
123+
NETDATA.morris_css = NETDATA.serverDefault + 'css/morris-0.5.1.css';
124124
NETDATA.google_js = 'https://www.google.com/jsapi';
125125

126126
NETDATA.themes = {
127127
white: {
128128
bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-3.3.7.min.css',
129-
dashboard_css: NETDATA.serverDefault + 'dashboard.css?v57',
129+
dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20161002-1',
130130
background: '#FFFFFF',
131131
foreground: '#000000',
132132
grid: '#DDDDDD',
@@ -142,8 +142,8 @@
142142
gauge_gradient: false
143143
},
144144
slate: {
145-
bootstrap_css: NETDATA.serverDefault + 'css/bootstrap.slate.min.css',
146-
dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v57',
145+
bootstrap_css: NETDATA.serverDefault + 'css/bootstrap.slate.min.css?v20161002-1',
146+
dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20161002-1',
147147
background: '#272b30',
148148
foreground: '#C8C8C8',
149149
grid: '#35393e',
@@ -5593,7 +5593,7 @@
55935593
}
55945594
},
55955595
{
5596-
url: NETDATA.serverDefault + 'lib/jquery.nanoscroller.min.js',
5596+
url: NETDATA.serverDefault + 'lib/jquery.nanoscroller-0.8.7.min.js',
55975597
isAlreadyLoaded: function() { return false; }
55985598
}
55995599
];
@@ -5615,10 +5615,6 @@
56155615
{
56165616
url: NETDATA.themes.current.dashboard_css,
56175617
isAlreadyLoaded: function() { return false; }
5618-
},
5619-
{
5620-
url: NETDATA.serverDefault + 'css/bootstrap-toggle.min.css',
5621-
isAlreadyLoaded: function() { return false; }
56225618
}
56235619
];
56245620

‎web/dashboard_info.js‎

100755100644
File mode changed.

‎web/goto-host-from-alarm.html‎

100755100644
File mode changed.

‎web/index.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,9 @@
13891389
function loadBootstrapTable(callback) {
13901390
if(bootstrapTableLoaded === false) {
13911391
bootstrapTableLoaded === true;
1392-
loadJs(NETDATA.serverDefault + 'lib/bootstrap-table.min.js?v1.11.0', function() {
1393-
loadJs(NETDATA.serverDefault + 'lib/bootstrap-table-export.min.js?v1.11.0', function() {
1394-
loadJs(NETDATA.serverDefault + 'lib/tableExport.js', callback);
1392+
loadJs(NETDATA.serverDefault + 'lib/bootstrap-table-1.11.0.min.js', function() {
1393+
loadJs(NETDATA.serverDefault + 'lib/bootstrap-table-export-1.11.0.min.js', function() {
1394+
loadJs(NETDATA.serverDefault + 'lib/tableExport-1.6.0.min.js', callback);
13951395
})
13961396
});
13971397
}
@@ -2402,13 +2402,18 @@
24022402
// callback to add the dashboard info to the
24032403
// parallel javascript downloader in netdata
24042404
var netdataPrepCallback = function() {
2405+
NETDATA.requiredCSS.push({
2406+
url: NETDATA.serverDefault + 'css/bootstrap-toggle-2.2.2.min.css',
2407+
isAlreadyLoaded: function() { return false; }
2408+
});
2409+
24052410
NETDATA.requiredJs.push({
2406-
url: NETDATA.serverDefault + 'lib/bootstrap-toggle.min.js',
2411+
url: NETDATA.serverDefault + 'lib/bootstrap-toggle-2.2.2.min.js',
24072412
isAlreadyLoaded: function() { return false; }
24082413
});
24092414

24102415
NETDATA.requiredJs.push({
2411-
url: NETDATA.serverDefault + 'dashboard_info.js?v58',
2416+
url: NETDATA.serverDefault + 'dashboard_info.js?v20161002-1',
24122417
async: false,
24132418
isAlreadyLoaded: function() { return false; }
24142419
});
@@ -3024,4 +3029,4 @@ <h4 class="modal-title" id="gotoServerModalLabel"><span id="gotoServerName"></sp
30243029
</div>
30253030
</body>
30263031
</html>
3027-
<script type="text/javascript" src="dashboard.js?v58"></script>
3032+
<script type="text/javascript" src="dashboard.js?v59"></script>

0 commit comments

Comments
 (0)