Merge pull request #34 from MapOnline/develop

Fix interact mode
MapcreatorIO · Mar 10, 2017 · 1a2293a · 1a2293a
2 parents aa1db19 + edaa402
commit 1a2293a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/js/helpers.js b/app/js/helpers.js
@@ -136,7 +136,7 @@ var helpers = {
 	 * Show the timeout overlay
 	 */
 	showTimeoutOverlay: function() {
-		if(main.environment === 'smart') {
+		if(main.interact === 'smart') {
 			main.timeoutOverlay.style.display = "block";
 			main.globals.interact.isInteracting = false;
 		}
@@ -146,7 +146,7 @@ var helpers = {
 	 * Hide the timeout overlay
 	 */
 	hideTimeoutOverlay: function() {
-		if(main.environment === 'smart') {
+		if(main.interact === 'smart') {
 			main.timeoutOverlay.style.display = "none";
 			main.globals.interact.isInteracting = true;
 		}

diff --git a/include/.DS_Store b/include/.DS_Store
diff --git a/include/iframe/index.php b/include/iframe/index.php
@@ -11,8 +11,8 @@
 }
 
 $id = isset($_GET['id']) ? htmlentities($_GET['id']) : "m4n-" . str_shuffle("withlovefrommaps4news");
-
 $env = isset($_GET['env']) ? htmlentities($_GET['env']) : "online";
+$interact = isset($_GET['interact']) ? htmlentities($_GET['interact']) : "scroll";
 
 ?>
 <html>
@@ -33,7 +33,8 @@
 				<script type="text/javascript">
 					var map = new M4nInteractive({
 							"path": "<?=$path;?>",
-							"environment": "<?=$env;?>"
+							"environment": "<?=$env;?>",
+							"interact": "<?=$interact;?>"
 						}, document.getElementById("<?=$id;?>"));
 				</script>
 			</div>

diff --git a/include/index.php b/include/index.php
@@ -11,7 +11,7 @@
 }
 
 $path = "/mnt/data/output/";
-if(preg_match("/^bleeding\\.maps4news\\.com$/i", $_SERVER['HTTP_HOST'])) {
+if(preg_match("/bleeding\\.maps4news\\.com$/i", $_SERVER['HTTP_HOST'])) {
 	$path = "/var/ace/output/";
 }