diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-03-20 10:40:26 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-03-20 10:40:26 -0700 |
commit | 5709c2a9aeefef46717ed18bf750bf8b22c3a34c (patch) | |
tree | 99eb8907c947f6b9f29cabceae7bc9da96374d55 /src/library_browser.js | |
parent | 4b4e8582dd7312062d5d19c7856101aae920ccee (diff) |
refactor Browser initialization
Diffstat (limited to 'src/library_browser.js')
-rw-r--r-- | src/library_browser.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index 5526456a..e61f84b5 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -45,9 +45,9 @@ mergeInto(LibraryManager.library, { moduleContextCreatedCallbacks: [], workers: [], - ensureObjects: function() { - if (Browser.ensured) return; - Browser.ensured = true; + init: function() { + if (Browser.initted) return; + Browser.initted = true; try { new Blob(); Browser.hasBlobConstructor = true; @@ -194,7 +194,8 @@ mergeInto(LibraryManager.library, { }; Module['preloadPlugins'].push(audioPlugin); - // is this the right place? + // Canvas event setup + var canvas = Module['canvas']; canvas.requestPointerLock = canvas['requestPointerLock'] || canvas['mozRequestPointerLock'] || @@ -300,6 +301,7 @@ mergeInto(LibraryManager.library, { Module.ctx = ctx; Module.useWebGL = useWebGL; Browser.moduleContextCreatedCallbacks.forEach(function(callback) { callback() }); + Browser.init(); } return ctx; }, |