dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-08 17:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch to os shim for safety (#1136)

Browse source 
* switch to os shim for safety

* Update Client.js
This commit is contained in:
Gus Caplan 2017-01-26 15:21:43 -06:00 committed by Amish Shah
parent ba11f76284
commit 87b600f78f
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/Client.js
View file

@ -1,3 +1,4 @@
const os = require('os');
const EventEmitter = require('events').EventEmitter; const EventEmitter = require('events').EventEmitter;
const mergeDefault = require('../util/MergeDefault'); const mergeDefault = require('../util/MergeDefault');
const Constants = require('../util/Constants'); const Constants = require('../util/Constants');
@ -216,7 +217,7 @@ class Client extends EventEmitter {
* @readonly * @readonly
*/ */
get browser() { get browser() {
return typeof window !== 'undefined'; return os.platform() === 'browser';
} }
/** /**

2
src/client/websocket/WebSocketManager.js
View file

@ -1,4 +1,4 @@
const browser = typeof window !== 'undefined'; const browser = require('os').platform() === 'browser';
const EventEmitter = require('events').EventEmitter; const EventEmitter = require('events').EventEmitter;
const Constants = require('../../util/Constants'); const Constants = require('../../util/Constants');
const convertArrayBuffer = require('../../util/ConvertArrayBuffer'); const convertArrayBuffer = require('../../util/ConvertArrayBuffer');

2
src/index.js
View file

@ -46,4 +46,4 @@ module.exports = {
Constants: require('./util/Constants'), Constants: require('./util/Constants'),
}; };
if (typeof window !== 'undefined') window.Discord = module.exports; // eslint-disable-line no-undef if (require('os').platform() === 'browser') window.Discord = module.exports; // eslint-disable-line no-undef

2
src/util/Constants.js
View file

@ -51,7 +51,7 @@ exports.DefaultOptions = {
*/ */
ws: { ws: {
large_threshold: 250, large_threshold: 250,
compress: typeof window === 'undefined', compress: require('os').platform() !== 'browser',
properties: { properties: {
$os: process ? process.platform : 'discord.js', $os: process ? process.platform : 'discord.js',
$browser: 'discord.js', $browser: 'discord.js',