Merge branch 'master' into basic-tiddlywiki-desktop

This commit is contained in:
lin onetwo 2020-06-27 14:13:00 +08:00 committed by GitHub
commit a4fbf9dbcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 7 deletions

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
logs
*.log
npm-debug.log*
yarn.lock
# Runtime data
pids

View file

@ -10,6 +10,8 @@
TiddlyGit is a cross-platform desktop app that make [nodejs-TiddlyWiki](https://github.com/Jermolene/TiddlyWiki5#installing-tiddlywiki-on-nodejs) easy to access.
The desktop app shell is based on [https://github.com/atomery/singlebox](atomery/singlebox) and [atomery/webcatalog](https://github.com/atomery/webcatalog), they provide lots of utils around website-generated-app, much powerful than generating app from website simply using Chrome.
### Why Github?
Because Github is one of the best free civil [BaaS](https://www.alibabacloud.com/blog/backend-as-a-service-baas-for-efficient-software-development_519851):

View file

@ -311,8 +311,19 @@ function createMenu() {
submenu: [
{ role: 'minimize' },
{ role: 'close' },
{ role: 'minimize' },
{ role: 'zoom' },
// role: 'zoom' is only supported on macOS
process.platform === 'darwin' ? {
role: 'zoom',
} : {
label: 'Zoom',
click: () => {
const win = mainWindow.get();
if (win != null) {
win.maximize();
}
},
},
{ type: 'separator' },
{ role: 'front' },
{ type: 'separator' },

View file

@ -334,7 +334,6 @@ webFrame.executeJavaScript(`
notif.addEventListener('click', () => {
window.postMessage({ type: 'focus-workspace', workspaceId: "${workspaceId}" });
});
console.log(notif);
return notif;
}
return null;

5
renovate.json Normal file
View file

@ -0,0 +1,5 @@
{
"extends": [
"config:base"
]
}

View file

@ -48,16 +48,16 @@ const loadListeners = (store) => {
store.dispatch(setWorkspace(id, value));
});
ipcRenderer.on('set-workspaces', () => {
store.dispatch(setWorkspaces());
ipcRenderer.on('set-workspaces', (e, newWorkspaces) => {
store.dispatch(setWorkspaces(newWorkspaces));
});
ipcRenderer.on('set-workspace-meta', (e, id, value) => {
store.dispatch(setWorkspaceMeta(id, value));
});
ipcRenderer.on('set-workspace-metas', () => {
store.dispatch(setWorkspaceMetas());
ipcRenderer.on('set-workspace-metas', (newWorkspaceMetas) => {
store.dispatch(setWorkspaceMetas(newWorkspaceMetas));
});
ipcRenderer.on('update-can-go-back', (e, value) => {