repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 95de4fabed72fa50e3f7f16fcd48002b6f0eee2d:
path_to: 
revision_to: 
git.thebackupbox.net
janusweb
git clone git://git.thebackupbox.net/janusweb
commit 95de4fabed72fa50e3f7f16fcd48002b6f0eee2d
Author: James Baicoianu 
Date:   Tue Jul 23 12:09:51 2019 -0700

    Respect room.teleport option

diff --git a/scripts/elements/teleporter.js b/scripts/elements/teleporter.js
index 6edf6ed87ff8aa29e8b992e673a7e0e4de2180d0..
index ..3ee71a189ecfac0bda953e467d5993c2733e4c8f 100644
--- a/scripts/elements/teleporter.js
+++ b/scripts/elements/teleporter.js
@@ -53,7 +53,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.disableCursor();
     },
     handleMouseDown(ev) {
-      if (ev.button == 0 && player.enabled) {
+      if (ev.button == 0 && player.enabled && room.teleport) {
         this.longpresstimer = setTimeout(this.enableCursor, this.longpresstime);
         this.mousediff = [0,0];
         this.active = false;

-----END OF PAGE-----