summaryrefslogtreecommitdiff
path: root/public/assets/javascripts
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-14 17:29:25 -0500
committerJules Laplace <jules@okfoc.us>2014-11-14 17:30:26 -0500
commit61343137b4600aa225318de352b06de6aa4d1707 (patch)
tree428b48b7e653a286fe85823e822f0fc2ce63ab16 /public/assets/javascripts
parent5b9b94d0dac5ddb70a5ea51b948cde40ae898202 (diff)
audio settings
Diffstat (limited to 'public/assets/javascripts')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.soundcloud.js3
-rw-r--r--public/assets/javascripts/ui/lib/Parser.js3
2 files changed, 4 insertions, 2 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 6ac64bb..75286d9 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -17,6 +17,7 @@ MX.Soundcloud = MX.Object3D.extend({
this.el.classList.add("mx-scenery")
this.el.style.backgroundRepeat = 'no-repeat'
+ this.paused = true
this.ops = ops
},
@@ -62,6 +63,8 @@ MX.Soundcloud = MX.Object3D.extend({
},
ready: function(){
+ this.seek( this.media.keyframe || 0 )
+
if (this.media.autoplay) {
this.play()
}
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index 87d52ef..8bc0310 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -132,8 +132,7 @@ var Parser = {
type: "soundcloud",
token: result.id,
thumbnail: result.artwork_url || result.user.avatar_url,
- title: result.title,
- description: result.user.username,
+ title: result.user.username + " - " + result.title,
width: 166,
height: 166,
})