Skip to content

Fix nwjs support #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qix- merged 2 commits into from
Jul 26, 2018
+4 −3
Merged

Fix nwjs support #569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
855a4bb
Fix nwjs support
miaulightouch May 11, 2018
eed5722
Merge branch 'master' into master
miaulightouch Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix nwjs support
  • Loading branch information
@miaulightouch
miaulightouch committed May 11, 2018
commit 855a4bbf30c003f2b5299946925c7acea5c55ba8
5 changes: 3 additions & 2 deletions src/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ exports.formatArgs = formatArgs;
exports.save = save;
exports.load = load;
exports.useColors = useColors;
exports.storage = 'undefined' != typeof chrome
exports.storage = 'undefined' == typeof process
&& 'undefined' != typeof chrome
&& 'undefined' != typeof chrome.storage
? chrome.storage.local
: localstorage();
Expand Down Expand Up @@ -42,7 +43,7 @@ function useColors() {
// NB: In an Electron preload script, document will be defined but not fully
// initialized. Since we know we're in Chrome, we'll just detect this case
// explicitly
if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
if (typeof window !== 'undefined' && window.process && (window.process.type === 'renderer' || window.process.__nwjs)) {
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/**
* Detect Electron renderer process, which is node, but we should
* Detect Electron renderer / nwjs process, which is node, but we should
* treat as a browser.
*/

if (typeof process === 'undefined' || process.type === 'renderer') {
if (typeof process === 'undefined' || process.type === 'renderer' || process.__nwjs) {
module.exports = require('./browser.js');
} else {
module.exports = require('./node.js');
Expand Down