aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-06-19 15:58:14 -0700
committerAlon Zakai <alonzakai@gmail.com>2014-06-19 15:58:14 -0700
commit43138933841d7075c2571345f3ffc48dcebeaf44 (patch)
tree995c8118f6732a866639ccfbb1ea2406035152cf
parentf167c351c3b062316f67dc8f363b1cb9b615eb72 (diff)
set window.scrollX|Y in workers to a fake 0
-rw-r--r--src/library_browser.js4
-rw-r--r--src/proxyWorker.js2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index 71aeeaae..544ba4dc 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -64,11 +64,7 @@ mergeInto(LibraryManager.library, {
}
},
isFullScreen: false,
-#if PROXY_TO_WORKER == 0
pointerLock: false,
-#else
- pointerLock: true, // XXX assume pointerlock in workers, for now
-#endif
moduleContextCreatedCallbacks: [],
workers: [],
diff --git a/src/proxyWorker.js b/src/proxyWorker.js
index 571a5ba1..1834164c 100644
--- a/src/proxyWorker.js
+++ b/src/proxyWorker.js
@@ -38,6 +38,8 @@ window.close = function window_close() {
postMessage({ target: 'window', method: 'close' });
};
+window.scrollX = window.scrollY = 0; // TODO: proxy these
+
var webGLWorker = new WebGLWorker();
var document = new EventListener();