LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge branch 'longle255-fix_loading_help_menu'

Browse source
This commit is contained in:
Jeremy Kauffman 2017-06-13 15:59:10 -04:00
commit 84589f1ebb
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -8,7 +8,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
## [Unreleased] ## [Unreleased]
### Added ### Added
* *
* *
### Changed ### Changed
@ -16,7 +16,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* *
### Fixed ### Fixed
* * Fix help menu force reloading whole app
* *
### Deprecated ### Deprecated

2
app/menu/main-menu.js
View file

@ -36,7 +36,7 @@ const baseTemplate = [
label: 'Help', label: 'Help',
click(item, focusedWindow) { click(item, focusedWindow) {
if (focusedWindow) { if (focusedWindow) {
focusedWindow.loadURL(`file://${__dirname}/../dist/index.html?help`); focusedWindow.webContents.send('open-menu', '/help');
} }
} }
} }

6
ui/js/main.js
View file

@ -49,6 +49,12 @@ ipcRenderer.on("open-uri-requested", (event, uri) => {
} }
}); });
ipcRenderer.on("open-menu", (event, uri) => {
if (uri && uri.startsWith("/help")) {
app.store.dispatch(doNavigate("/help"));
}
});
document.addEventListener("click", event => { document.addEventListener("click", event => {
var target = event.target; var target = event.target;
while (target && target !== document) { while (target && target !== document) {