Browse Source

removed blind copy/paste console.log....

improved CSS to comply with CODACY rules
v2
userName 6 years ago
parent
commit
df9fecd16a
2 changed files with 38 additions and 16 deletions
  1. +13
    -6
      code/html/custom.css
  2. +25
    -10
      code/html/custom.js

+ 13
- 6
code/html/custom.css View File

@ -250,9 +250,11 @@ span.slider {
position: absolute; position: absolute;
left: -99em; left: -99em;
} }
label[for].toggle{
margin: 0px;
padding: 0px;
}
.toggle{ .toggle{
margin: 0px !important;
padding: 0px!important;
letter-spacing:normal; letter-spacing:normal;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
@ -277,10 +279,16 @@ span.slider {
content: "NO"; content: "NO";
left: 20px; left: 20px;
} }
input[name="relay"] + .toggle:before{
content: "OFF";
}
.toggle:after{ .toggle:after{
content: "YES"; content: "YES";
right: 20px; right: 20px;
} }
input[name="relay"] + .toggle:after{
content: "ON";
}
.toggle__handler{ .toggle__handler{
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -307,10 +315,6 @@ input:checked + .toggle:before {
input + .toggle:before { input + .toggle:before {
color: #fff; color: #fff;
} }
input[disabled] + .toggle .toggle__handler{
background: #CCC !important;
}
input:checked + .toggle .toggle__handler{ input:checked + .toggle .toggle__handler{
width: 50%; width: 50%;
background: #00c000; background: #00c000;
@ -322,6 +326,9 @@ input:checked + .toggle .toggle__handler{
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
} }
input[disabled] + .toggle .toggle__handler{
background: #ccc;
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Loading Loading


+ 25
- 10
code/html/custom.js View File

@ -814,7 +814,6 @@ function initRelays(data) {
$(":checkbox", line).prop('checked', data[i]).attr("data", i) $(":checkbox", line).prop('checked', data[i]).attr("data", i)
.prop("id", "relay" + i) .prop("id", "relay" + i)
.on("change", function (event) { .on("change", function (event) {
console.log("sending message");
var id = parseInt($(event.target).attr("data"), 10); var id = parseInt($(event.target).attr("data"), 10);
var status = $(event.target).prop("checked"); var status = $(event.target).prop("checked");
doToggle(id, status); doToggle(id, status);
@ -1523,6 +1522,9 @@ function initUrls(root) {
} else { } else {
urls.ws.protocol = "ws:"; urls.ws.protocol = "ws:";
} }
<!-- removeIf(!cleanIt) -->
urls.ws.port = Number(urls.ws.port) + 1;
<!-- endRemoveIf(!cleanIt) -->
} }
@ -1530,24 +1532,37 @@ function connectToURL(url) {
initUrls(url); initUrls(url);
<!-- removeIf(!cleanIt) -->
/*
<!-- endRemoveIf(!cleanIt) -->
$.ajax({ $.ajax({
'method': 'GET', 'method': 'GET',
'crossDomain': true, 'crossDomain': true,
'url': urls.auth.href, 'url': urls.auth.href,
'xhrFields': { 'withCredentials': true } 'xhrFields': { 'withCredentials': true }
}).done(function(data) { }).done(function(data) {
if (websock) { websock.close(); }
websock = new WebSocket(urls.ws.href);
websock.onmessage = function(evt) {
var data = getJson(evt.data.replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t"));
if (data) {
processData(data);
}
};
<!-- removeIf(!cleanIt) -->
*/
<!-- endRemoveIf(!cleanIt) -->
if (websock) {
websock.close();
}
websock = new WebSocket(urls.ws.href);
websock.onmessage = function (evt) {
var data = getJson(evt.data.replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t"));
if (data) {
processData(data);
}
};
<!-- removeIf(!cleanIt) -->
/*
<!-- endRemoveIf(!cleanIt) -->
}).fail(function() { }).fail(function() {
// Nothing to do, reload page and retry // Nothing to do, reload page and retry
}); });
<!-- removeIf(!cleanIt) -->
*/
<!-- endRemoveIf(!cleanIt) -->
} }
function connect(host) { function connect(host) {


Loading…
Cancel
Save