diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-14 17:29:25 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-14 17:30:26 -0500 |
| commit | 61343137b4600aa225318de352b06de6aa4d1707 (patch) | |
| tree | 428b48b7e653a286fe85823e822f0fc2ce63ab16 | |
| parent | 5b9b94d0dac5ddb70a5ea51b948cde40ae898202 (diff) | |
audio settings
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.soundcloud.js | 3 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/lib/Parser.js | 3 | ||||
| -rw-r--r-- | views/controls/editor/media-editor.ejs | 8 | ||||
| -rw-r--r-- | views/controls/reader/media-player.ejs | 2 |
4 files changed, 10 insertions, 6 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, }) diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 1f4f720..99746e8 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -11,7 +11,7 @@ <textarea name="description" placeholder="short description"></textarea> </div> - <div class="video setting"> + <div class="video audio setting"> <span class="playButton" data-role="play-media"> <span class="on ion-ios7-play-outline"></span> <span class="off ion-ios7-pause-outline"></span> @@ -21,15 +21,17 @@ ion-volume-mute --> </div> - <div class="video setting"> + <div class="video audio setting"> <input type="checkbox" name="autoplay" value="1" id="video_autoplay"> <label for="video_autoplay">Autoplay</label> <input type="checkbox" name="loop" value="1" id="video_loop"> <label for="video_loop">Loop</label> + <span class="video"> <input type="checkbox" name="mute" value="1" id="video_mute"> <label for="video_mute">Mute</label> + </span> </div> - <div class="video setting"> + <div class="video audio setting"> <label for="video-keyframe">Initial Still</label> <br> <input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe"> diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs index 9872592..cac9992 100644 --- a/views/controls/reader/media-player.ejs +++ b/views/controls/reader/media-player.ejs @@ -1,6 +1,6 @@ <div class="vvbox settings" id="mediaPlayer"> - <span class="playButton video" data-role="play-media"> + <span class="playButton video audio" data-role="play-media"> <span class="on ion-play"></span> <span class="off ion-pause"></span> </span> |