Skip to content

Commit

Permalink
Merge pull request #46 from kethinov/0.5.3
Browse files Browse the repository at this point in the history
0.5.3
  • Loading branch information
Autre31415 authored Oct 21, 2019
2 parents 08dc861 + 8a54e9d commit 85f714e
Show file tree
Hide file tree
Showing 5 changed files with 1,802 additions and 2,485 deletions.
12 changes: 6 additions & 6 deletions build.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const fs = require('fs')
let glyphrPath = 'node_modules/Glyphr-Studio/dev/Glyphr_Studio.html'
let glyphrElectron = 'node_modules/Glyphr-Studio/dev/Glyphr_Studio_Electron.html'
let rendererJs = '<script>require(\'../../../renderer.js\')</script></body>'
let rendererCss = 'href="Glyphr_Studio.css" />\n<link rel="stylesheet" type="text/css" href="../../../renderer.css" />'
let html = fs.readFileSync(glyphrPath, 'utf8')
const glyphrPath = 'node_modules/Glyphr-Studio/dev/Glyphr_Studio.html'
const glyphrElectron = 'node_modules/Glyphr-Studio/dev/Glyphr_Studio_Electron.html'
const rendererJs = '<script>require(\'../../../renderer.js\')</script></body>'
const rendererCss = 'href="Glyphr_Studio.css" />\n<link rel="stylesheet" type="text/css" href="../../../renderer.css" />'
const html = fs.readFileSync(glyphrPath, 'utf8')

fs.readFile(glyphrElectron, 'utf8', (err, data) => {
if (err) {
Expand All @@ -19,7 +19,7 @@ fs.readFile(glyphrElectron, 'utf8', (err, data) => {
})

function generateGlyphrElectron () {
let htmlWithRenderer = html
const htmlWithRenderer = html
// add renderer.js
.replace('</body>', rendererJs)

Expand Down
6 changes: 3 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ function createWindow () {
win = new BrowserWindow({
width: 1300,
height: 900,
minWidth: 1024,
minHeight: 768,
minWidth: 800,
minHeight: 640,
icon: process.platform === 'linux' && path.join(__dirname, '/images/appicon.png'),
webPreferences: {
nodeIntegration: true
}
})
win.loadURL(path.join('file://', __dirname, '/node_modules/Glyphr-Studio/dev/Glyphr_Studio_Electron.html'))

let webContents = win.webContents
const webContents = win.webContents

// enable for debugging
// win.webContents.openDevTools()
Expand Down
Loading

0 comments on commit 85f714e

Please sign in to comment.