summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-15 11:55:32 -0500
committerJules Laplace <jules@okfoc.us>2014-11-15 11:55:32 -0500
commit05b73f5e56fd728454faac8e97d57786fdfb3b51 (patch)
treec469a63a5e0d5b12ee628f314068cf92cc90aee1 /public/assets/javascripts/rectangles/engine/scenery/_scenery.js
parentb3f8d220c650482b117d6577b85bd7ef07e533df (diff)
parent84d606cc4c56778ae7e6b8b7d86e100131717a53 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/scenery/_scenery.js')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/_scenery.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 436712a..d03e0e1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -27,9 +27,14 @@ var Scenery = new function(){
scene_media = new Scenery.types.video (opt)
break
+ case 'soundcloud':
+ if (is_mobile) return
+ scene_media = new Scenery.types.audio (opt)
+ break
+
case 'text':
scene_media = new Scenery.types.text (opt)
- scene_media.focused = true
+ scene_media.focused = !! opt.newMedia
break
}
base.list[scene_media.id] = scene_media
@@ -37,6 +42,7 @@ var Scenery = new function(){
}
base.addNextToWall = function(opt){
+ opt.newMedia = true
opt.media = base.nextMedia
opt.index = opt.index || 0
var scene_media = base.add(opt)