summaryrefslogtreecommitdiff
path: root/site/public/assets/javascripts/app.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-09-02 13:24:55 -0400
committerJules Laplace <jules@okfoc.us>2016-09-02 13:24:55 -0400
commit8def9579f2a78e80652d1e5e6f1eda510ae9a5dd (patch)
treec56d664f04d55f0d75c6d4f5e2d6fc567054498d /site/public/assets/javascripts/app.js
parent4ed81fa59119cee66b0413c5662639ec81fea4dc (diff)
parent5052d51aa4c55eabc736b3c76a783db2f5208289 (diff)
merge changes from twohustlers
Diffstat (limited to 'site/public/assets/javascripts/app.js')
-rw-r--r--site/public/assets/javascripts/app.js20
1 files changed, 11 insertions, 9 deletions
diff --git a/site/public/assets/javascripts/app.js b/site/public/assets/javascripts/app.js
index dd68726..4e00f30 100644
--- a/site/public/assets/javascripts/app.js
+++ b/site/public/assets/javascripts/app.js
@@ -18,7 +18,13 @@ app.init = function () {
}
app.launch = function () {
- if ($.browser.msie || ! has3d()) { return app.fallback() }
+ // if ($.browser.msie || ! has3d()) { return app.fallback() }
+ if ($.browser.msie) {
+ $("html").addClass("msie")
+ }
+ else {
+ $("html").addClass("notmsie")
+ }
scene = new MX.Scene().addTo('#scene')
@@ -36,14 +42,10 @@ app.launch = function () {
// app.movements.update(dt || 0)
}
- var loader = new Loader(function(){
- $("#loader").hide()
- window.environment && window.environment.init()
- animate()
- })
-
- // loader.preloadImages([])
- loader.ready()
+ FastClick.attach(document.body)
+
+ window.environment && window.environment.init()
+ animate()
window.scrollTo(0,0)
}