From 9cf486a5c25b4201e18771aad1b112a0abe78df5 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Wed, 26 Aug 2015 14:27:22 +0200 Subject: [PATCH] Viva javascript --- controllers/prototype/index.js | 2 +- js/l3d/src/cameras/PointerCamera.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/prototype/index.js b/controllers/prototype/index.js index 74898c5..fdf51bb 100644 --- a/controllers/prototype/index.js +++ b/controllers/prototype/index.js @@ -151,7 +151,7 @@ function editorHelper(templateName) { }; -}; +} module.exports.clicker = editorHelper('prototype_clicker.jade'); module.exports.viewer = editorHelper('prototype_viewer.jade'); diff --git a/js/l3d/src/cameras/PointerCamera.js b/js/l3d/src/cameras/PointerCamera.js index aef18ae..6de3d43 100644 --- a/js/l3d/src/cameras/PointerCamera.js +++ b/js/l3d/src/cameras/PointerCamera.js @@ -210,8 +210,7 @@ L3D.PointerCamera.prototype.lockPointer = function() { * @returns true if the pointer is locked, false otherwise */ L3D.PointerCamera.prototype.isLocked = function() { - return - document.pointerLockElement === this.renderer.domElement || + return document.pointerLockElement === this.renderer.domElement || document.mozPointerLockElement === this.renderer.domElement || document.webkitPointerLockElement === this.renderer.domElement;