summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-10 19:46:51 -0400
committerJulie Lala <jules@okfoc.us>2014-06-10 19:46:51 -0400
commit3074488306e041718dec221ff9142748e2e68916 (patch)
tree1c24411a4b1eb20ad5ae2356752dc37652e4dc01
parent3f8e4223cc57bc3fd461881e3d6e9eb331bf4dc5 (diff)
addclass desktop
-rw-r--r--public/assets/javascripts/app.js4
-rw-r--r--public/assets/javascripts/ui/z_misc.js7
2 files changed, 4 insertions, 7 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 3c0fbe5..d123db3 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -6,10 +6,14 @@ var is_mobile = is_iphone || is_ipad || is_android;
if (is_mobile) {
// window.location.href = "mobile.html"
+ $("html").addClass("mobile");
}
else if ($.browser.msie || ! has3d()) {
// window.location.href = "error.html"
}
+else {
+ $("html").addClass("desktop");
+}
var scene, cam, map;
diff --git a/public/assets/javascripts/ui/z_misc.js b/public/assets/javascripts/ui/z_misc.js
index 780529f..612057e 100644
--- a/public/assets/javascripts/ui/z_misc.js
+++ b/public/assets/javascripts/ui/z_misc.js
@@ -1,13 +1,6 @@
function bind () {
- if(is_mobile) {
- $("html").addClass("mobile");
- }
- else {
- $("html").addClass("desktop");
- }
-
$.fn.clickToToggle = function(fn){
$(this).click(function(e){
e.stopPropagation()