LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-23 17:47:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: __static path not resolving on development environment (#1165)

Browse source 
This fixes https://github.com/electron-userland/electron-webpack/issues/52
This commit is contained in:
Igor Gassmann 2018-03-22 10:53:24 -04:00 • committed by GitHub
parent b6351a367a
commit 4b41c6335d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.json
View file

@ -20,7 +20,6 @@
}, },
"globals": { "globals": {
"__static": true, "__static": true,
"staticResourcesPath": true,
"__": true, "__": true,
"__n": true, "__n": true,
"app": true "app": true

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Error when clicking LBRY URLs when app is closed on macOS ([#1119](https://github.com/lbryio/lbry-app/issues/1119)) * Error when clicking LBRY URLs when app is closed on macOS ([#1119](https://github.com/lbryio/lbry-app/issues/1119))
* LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120)) * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120))
* Fix Windows notifications not showing ([1145](https://github.com/lbryio/lbry-app/pull/1145)) * Fix Windows notifications not showing ([1145](https://github.com/lbryio/lbry-app/pull/1145))
* Fix __static path not resolving on development environment
### Deprecated ### Deprecated
* *

10
src/renderer/app.js
View file

@ -22,16 +22,6 @@ const app = {
}, },
}; };
// Workaround for https://github.com/electron-userland/electron-webpack/issues/52
if (!isDev) {
window.staticResourcesPath = Path.join(remote.app.getAppPath(), '../static').replace(
/\\/g,
'\\\\'
);
} else {
window.staticResourcesPath = '';
}
// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle
global.__ = i18n.__; global.__ = i18n.__;
// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle

2
src/renderer/lbry.js
View file

@ -172,7 +172,7 @@ Lbry.publishDeprecated = (params, fileListedCallback, publishedCallback, errorCa
); );
}; };
Lbry.imagePath = file => `${staticResourcesPath}/img/${file}`; Lbry.imagePath = file => `file://${__static}/img/${file}`;
Lbry.getMediaType = (contentType, fileName) => { Lbry.getMediaType = (contentType, fileName) => {
if (contentType) { if (contentType) {

2
src/renderer/redux/selectors/settings.js
View file

@ -30,6 +30,6 @@ export const selectThemePath = createSelector(
selectIsNight, selectIsNight,
(theme, automaticDarkModeEnabled, isNight) => { (theme, automaticDarkModeEnabled, isNight) => {
const dynamicTheme = automaticDarkModeEnabled && isNight ? 'dark' : theme; const dynamicTheme = automaticDarkModeEnabled && isNight ? 'dark' : theme;
return `${staticResourcesPath}/themes/${dynamicTheme || 'light'}.css`; return `file://${__static}/themes/${dynamicTheme || 'light'}.css`;
} }
); );