-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #237 from FaultyFunctions/various-bug-fixes
Various bug fixes & improvements
- Loading branch information
Showing
18 changed files
with
529 additions
and
317 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,23 @@ | ||
// This file serves as e middle layer to communicate between the web app and electron's native features | ||
const electron = require("electron"); | ||
const electron = require('electron'); | ||
const ipcRenderer = electron.ipcRenderer; | ||
const fs = require("fs"); | ||
const path = require('path'); | ||
const fs = require('fs'); | ||
const yarnWindow = electron.remote.getCurrentWindow(); | ||
let yarn = null; | ||
|
||
const editorFrameEl = document.getElementById("yarn-frame"); | ||
window.addEventListener("yarnReady", e => { | ||
const editorFrameEl = document.getElementById('yarn-frame'); | ||
window.addEventListener('yarnReady', (e) => { | ||
//give the yarn webb app the fs module, so we can ctrl+s in electron without pop ups | ||
yarn = e; | ||
yarn.app.fs = fs; | ||
yarn.app.electron = electron; | ||
ipcRenderer.send("yarn-ready"); | ||
yarn.app.path = path; | ||
ipcRenderer.send('yarn-ready'); | ||
}); | ||
editorFrameEl.src = "app/index.html"; | ||
editorFrameEl.src = 'app/index.html'; | ||
|
||
// Called on load yarn data. | ||
window.addEventListener("yarnLoadedData", e => { | ||
window.addEventListener('yarnLoadedData', (e) => { | ||
// yarnWindow.setTitle(e.data.editingPath()); | ||
}); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.