diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_browser.js | 6 | ||||
| -rw-r--r-- | src/library_sockfs.js | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index 59d2945e..5ec02eee 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -782,7 +782,11 @@ mergeInto(LibraryManager.library, { } } else { Browser.mainLoop.scheduler = function() { - Browser.requestAnimationFrame(Browser.mainLoop.runner); + if (typeof window === 'undefined') { // requestAnimationFrame will fail if window is undefined (e.g. in Node.js) + setTimeout(Browser.mainLoop.runner, 1000/60); + } else { + Browser.requestAnimationFrame(Browser.mainLoop.runner); + } } } Browser.mainLoop.scheduler(); diff --git a/src/library_sockfs.js b/src/library_sockfs.js index af29d11b..0e083bfd 100644 --- a/src/library_sockfs.js +++ b/src/library_sockfs.js @@ -138,7 +138,9 @@ mergeInto(LibraryManager.library, { console.log('connect: ' + url); #endif // the node ws library API is slightly different than the browser's - var opts = ENVIRONMENT_IS_NODE ? {} : ['binary']; + var opts = ENVIRONMENT_IS_NODE ? {headers: {'websocket-protocol': ['binary']}} : ['binary']; + // If node we use the ws library. + WebSocket = ENVIRONMENT_IS_NODE ? require('ws') : WebSocket; ws = new WebSocket(url, opts); ws.binaryType = 'arraybuffer'; } catch (e) { @@ -573,4 +575,4 @@ mergeInto(LibraryManager.library, { } } } -});
\ No newline at end of file +}); |