Commit 45abb5d6 authored by Mihkel Putrinš's avatar Mihkel Putrinš
Browse files

cleanup

parent 5e93be9a
...@@ -18,11 +18,7 @@ var pjson_path = path.join(__dirname, '..', 'package.json') ...@@ -18,11 +18,7 @@ var pjson_path = path.join(__dirname, '..', 'package.json')
var pjson = require(pjson_path) var pjson = require(pjson_path)
if (IS_DEV) { if (IS_DEV) {
pjson.build++ pjson.build++
<<<<<<< HEAD
fs.writeFileSync(pjson_path, JSON.stringify(pjson, null, 4))
=======
fs.writeFileSync(pjson_path, JSON.stringify(pjson, null, 2)) fs.writeFileSync(pjson_path, JSON.stringify(pjson, null, 2))
>>>>>>> master
} }
console.log('----==== ' + pjson.name + ' v.' + pjson.version + ' (build ' + (pjson.build) + ') ====----') console.log('----==== ' + pjson.name + ' v.' + pjson.version + ' (build ' + (pjson.build) + ') ====----')
...@@ -33,7 +29,7 @@ app.on('ready', function() { ...@@ -33,7 +29,7 @@ app.on('ready', function() {
"partition": "persist:panustaja (build " + (pjson.build) + ")", "partition": "persist:panustaja (build " + (pjson.build) + ")",
} }
windows['authWindow'] = new BrowserWindow({ width: 900, height: 600, show: true, "web-preferences": web_preferences }) windows['authWindow'] = new BrowserWindow({ width: 900, height: 600, show: true, "web-preferences": web_preferences })
windows['authWindow'].webContents.openDevTools(true) // windows['authWindow'].webContents.openDevTools(true)
var title = pjson.name + ' v.' + pjson.version + (pjson.version.indexOf('-') > -1 ? pjson.build : '') + ' | Logi sisse' var title = pjson.name + ' v.' + pjson.version + (pjson.version.indexOf('-') > -1 ? pjson.build : '') + ' | Logi sisse'
windows['authWindow'].center() windows['authWindow'].center()
windows['authWindow'].setTitle(title) windows['authWindow'].setTitle(title)
...@@ -62,8 +58,8 @@ app.on('ready', function() { ...@@ -62,8 +58,8 @@ app.on('ready', function() {
mainWindow.center() mainWindow.center()
var view_path = path.join(app.getAppPath(), 'code', 'panu_view.html') var view_path = path.join(app.getAppPath(), 'code', 'panu_view.html')
mainWindow.webContents.loadUrl('file://' + view_path) mainWindow.webContents.loadUrl('file://' + view_path)
mainWindow.webContents.openDevTools(true)
if (IS_DEV) { if (IS_DEV) {
mainWindow.webContents.openDevTools(true)
} }
windows['authWindow'].close() windows['authWindow'].close()
delete windows['authWindow'] delete windows['authWindow']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment