summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/app.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-06-20 17:31:52 -0400
committerJules Laplace <jules@okfoc.us>2014-06-20 17:31:52 -0400
commit0b3ccda85b46183bd17cb765ab20bddeeae1a2e9 (patch)
tree669e21f903f089cce56891b845b9f6adef7a14c4 /public/assets/javascripts/app.js
parent712387da2f75c845807ad4489b29fec34bfe9a56 (diff)
parent850c4202885867350ecccc88a4f315d6196a7326 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/app.js')
-rw-r--r--public/assets/javascripts/app.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 2d7961b..3d0d3c4 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -68,8 +68,8 @@ app.launch = function () {
var loader = new Loader(function(){
$("#loader").hide()
window.environment && window.environment.init()
- window.editor && window.editor.init()
- window.path && window.path.init()
+ // window.editor && window.editor.init()
+ // window.path && window.path.init()
animate()
})
@@ -93,7 +93,6 @@ app.position = function(obj){
rotationX: obj.rotationX,
rotationY: obj.rotationY
}
- console.log(obj.scale)
if (obj.scale !== 1) {
pos.scale = obj.scale
}