fix tabs, remove extra spaces and lines.

This commit is contained in:
Rodrigo Ramírez Norambuena
2016-12-29 22:23:08 -03:00
parent 4237d0c7e3
commit 19d906c5e4
17 changed files with 75 additions and 77 deletions

View File

@@ -79,7 +79,7 @@ function cloneObject(obj) {
var temp = obj.constructor(); // give temp the original obj's constructor
for (var key in obj) {
temp[key] = cloneObject(obj[key]);
if (key === "lockStrings") {
Log.log(key);
}

View File

@@ -12,7 +12,7 @@ var defaults = {
kioskmode: false,
electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
language: "en",
timeFormat: 24,
units: "metric",

View File

@@ -18,15 +18,15 @@ const BrowserWindow = electron.BrowserWindow;
let mainWindow;
function createWindow() {
var electronOptionsDefaults = {
width: 800,
height: 600,
x: 0,
width: 800,
height: 600,
x: 0,
y: 0,
darkTheme: true,
darkTheme: true,
webPreferences: {
nodeIntegration: false,
nodeIntegration: false,
zoomFactor: config.zoom
}
}

View File

@@ -41,7 +41,7 @@ var Server = function(config, callback) {
app.get("/version", function(req,res) {
res.send(global.version);
});
app.get("/", function(req, res) {
var html = fs.readFileSync(path.resolve(__dirname + "/../index.html"), {encoding: "utf8"});
html = html.replace("#VERSION#", global.version);