From 1c8ecab7cc040196cf585d618b5eb9289a2efbc6 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 5 Jun 2014 15:19:33 -0400 Subject: moving things around --- public/assets/javascripts/app.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'public/assets/javascripts') diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 65378ee..ba210b8 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -5,22 +5,23 @@ var is_android = (navigator.userAgent.match(/Android/i)) var is_mobile = is_iphone || is_ipad || is_android; if (is_mobile) { - window.location.href = "mobile.html" + // window.location.href = "mobile.html" } else if ($.browser.msie || ! has3d()) { - window.location.href = "error.html" + // window.location.href = "error.html" } -var scene, - cam, - map; +var scene, cam, map; var viewHeight = window.viewHeight || 150 var app = new function(){} app.init = function () { + app.tube = new Tube () +} +app.launch = function () { var mainbox, coords, box, size, @@ -42,8 +43,6 @@ app.init = function () { cam = scene.camera cam.y = viewHeight - app.tube = new Tube () - if (MX.Map) map = app.map = new MX.Map() movements = app.movements = new MX.Movements(cam, viewHeight) -- cgit v1.2.3-70-g09d2