diff options
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/nms-data.js | 2 | ||||
| -rw-r--r-- | web/js/nms-info-box.js | 6 | ||||
| -rw-r--r-- | web/js/nms-map-handlers.js | 4 | ||||
| -rw-r--r-- | web/js/nms-oplog.js | 21 | ||||
| -rw-r--r-- | web/js/nms-search.js | 2 | ||||
| -rw-r--r-- | web/js/nms.js | 5 |
6 files changed, 25 insertions, 15 deletions
diff --git a/web/js/nms-data.js b/web/js/nms-data.js index 37cc11c..c923e08 100644 --- a/web/js/nms-data.js +++ b/web/js/nms-data.js @@ -275,7 +275,7 @@ nmsData._genericUpdater = function(name, cacheok) { url: this._sources[name].target + now, dataType: "text", success: function (indata, textStatus, jqXHR) { - let etag = jqXHR.getResponseHeader("ETag"); + var etag = jqXHR.getResponseHeader("ETag"); if (nmsData[name] == undefined || (nmsData[name]['hash'] != etag && nmsData[name]['hash'] != etag.slice(2))) { var data = JSON.parse(indata); if (name == "ping") { diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js index e15507d..ca5b6c7 100644 --- a/web/js/nms-info-box.js +++ b/web/js/nms-info-box.js @@ -947,9 +947,9 @@ var switchCommentsPanel = function () { td1 = tr.insertCell(0); td2 = tr.insertCell(1); var date = new Date(logs[v]['timestamp']); - let month = date.getMonth() + 1; - let day = date.getDate(); - let tmp = (date.getYear() + 1900) + "-" + (month < 10 ? "0": "") + month + "-" + (day < 10 ? "0" : "") + day + " " + date.toTimeString().replace(/:\d\d .*$/,""); + var month = date.getMonth() + 1; + var day = date.getDate(); + var tmp = (date.getYear() + 1900) + "-" + (month < 10 ? "0": "") + month + "-" + (day < 10 ? "0" : "") + day + " " + date.toTimeString().replace(/:\d\d .*$/,""); td1.textContent = tmp; td1.classList.add("left"); td2.textContent = "[" + logs[v]['username'] + "] " + logs[v]['log']; diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index 4cf2fea..b88b858 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -332,7 +332,7 @@ function tempInfo(sw) ret.score = 0; ret.data[0].value = "N/A"; if (testTree(nmsData,['switchstate','switches',sw,'temp'])) { - let temp = nmsData.switchstate.switches[sw].temp; + var temp = nmsData.switchstate.switches[sw].temp; if (temp == undefined) { ret.data[0].value = "N/A"; } else { @@ -400,7 +400,7 @@ function pingInfo(sw) ret.score = 250; ret.why = "No IPv6 ping reply"; } else if (v4 == undefined) { - ret.score = 249; + ret.score = 800; ret.why = "No IPv4 ping reply"; } diff --git a/web/js/nms-oplog.js b/web/js/nms-oplog.js index 42b29dc..b1f979f 100644 --- a/web/js/nms-oplog.js +++ b/web/js/nms-oplog.js @@ -15,7 +15,9 @@ nmsOplog._reset = function() { document.getElementById('searchbox').oninput(); } -nmsOplog.getUser = function(force = false) { +nmsOplog.getUser = function(force) { + if (force == undefined) + force = false; var user = nms.user; if (user == undefined || force) { user = prompt("Who are you? Short nick for the record."); @@ -38,6 +40,9 @@ nmsOplog.commit = function() { nmsOplog._reset(); return; } + if (d == undefined || d == null || d == "") { + return; + } var myData = {"user": user, "systems": s, "log": d}; myData = JSON.stringify(myData); @@ -64,8 +69,10 @@ nmsOplog.getSwitchLogs = function(sw) { return []; for (var v in nmsData['oplog']['oplog']) { var log = nmsData['oplog']['oplog'][v]; - if (nmsSearch.searchTest(log['systems'],sw)) { - logs.push(log); + if (log['systems'] != "" && log['systems'] != undefined) { + if (nmsSearch.searchTest(log['systems'],sw)) { + logs.push(log); + } } } return logs; @@ -89,13 +96,13 @@ nmsOplog._updateComments = function(limit,prefix,timefield,cutoff) { if (timefield == "time") { td1.textContent = date.toTimeString().replace(/:\d\d .*$/,""); } else { - let month = date.getMonth() + 1; - let day = date.getDate(); - let tmp = (date.getYear() + 1900) + "-" + (month < 10 ? "0": "") + month + "-" + (day < 10 ? "0" : "") + day + " " + date.toTimeString().replace(/:\d\d .*$/,""); + var month = date.getMonth() + 1; + var day = date.getDate(); + var tmp = (date.getYear() + 1900) + "-" + (month < 10 ? "0": "") + month + "-" + (day < 10 ? "0" : "") + day + " " + date.toTimeString().replace(/:\d\d .*$/,""); td1.textContent = tmp; } td1.classList.add("left"); - let data = nmsData['oplog']['oplog'][v]['log']; + var data = nmsData['oplog']['oplog'][v]['log']; if (cutoff && data.length > cutoff) { data = data.slice(0,cutoff); data = data + "(...)"; diff --git a/web/js/nms-search.js b/web/js/nms-search.js index fb8e725..a292814 100644 --- a/web/js/nms-search.js +++ b/web/js/nms-search.js @@ -46,7 +46,7 @@ nmsSearch.searchTest = function(id, sw) { limit = limit.replace("active=",""); var operator = id.replace("active","")[0]; if (limit == parseInt(limit)) { - var ports = parseInt(nmsData.switchstate.switches[sw].ifs.ge.live); + var ports = parseInt(nmsData.switchstate.switches[sw].totals.live); limit = parseInt(limit); if (operator == ">" ) { if (ports > limit) { diff --git a/web/js/nms.js b/web/js/nms.js index dc9ba96..0b9fc73 100644 --- a/web/js/nms.js +++ b/web/js/nms.js @@ -234,8 +234,11 @@ function ensureAnchorHas(view) { * stopTv esnures that we don't conflict with the tvmode thing. If a * user-initiated map is selected, tvmode is disabled. */ -function setUpdater(fo, stopTv = true) +function setUpdater(fo, stopTv ) { + if (stopTv == undefined) { + stopTv = true; + } if (stopTv) nms.tvmode.stop(); nmsMap.reset(); |