Merge pull request #585 from roramirez/extra-spaces

fix tabs, remove extra spaces and lines.
This commit is contained in:
Michael Teeuw
2016-12-31 19:12:24 +01:00
committed by GitHub
21 changed files with 82 additions and 83 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(global.root_path + "/index.html"), {encoding: "utf8"});
html = html.replace("#VERSION#", global.version);