diff options
| author | ryderr <r@okfoc.us> | 2014-11-17 11:23:53 -0500 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-11-17 11:23:53 -0500 |
| commit | 21e23e63e089685a558d2e5c74439e9de5c33c4f (patch) | |
| tree | 6ee8cf44e00aca897ec02d48a1e398c4e41092cb /public/assets/javascripts/ui/reader/MediaPlayer.js | |
| parent | 39fa1a5b835797deb4b28d7ba6faae766a979dca (diff) | |
| parent | 84d606cc4c56778ae7e6b8b7d86e100131717a53 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/reader/MediaPlayer.js')
| -rw-r--r-- | public/assets/javascripts/ui/reader/MediaPlayer.js | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js index 42e7596..8424d9c 100644 --- a/public/assets/javascripts/ui/reader/MediaPlayer.js +++ b/public/assets/javascripts/ui/reader/MediaPlayer.js @@ -49,6 +49,9 @@ var MediaPlayer = FormView.extend({ return false } } + else if (media.type == "text") { + return false + } this.bind(scenery) this.$el.addClass("active") @@ -58,8 +61,9 @@ var MediaPlayer = FormView.extend({ switch (media.type) { case "image": - this.$(".image").show() this.$(".video").hide() + this.$(".audio").hide() + this.$(".image").show() // this.$widthDimension.html( Number(media.widthDimension) || "" ) // this.$heightDimension.html( Number(media.heightDimension) || "" ) @@ -70,13 +74,22 @@ var MediaPlayer = FormView.extend({ case "youtube": case "vimeo": case "video": - this.$(".video").show() this.$(".image").hide() + this.$(".audio").hide() + this.$(".video").show() this.$playButton.toggleClass("paused", ! this.scenery.paused()) this.$muteButton.toggleClass("muted", this.scenery.muted()) break + + case "soundcloud": + this.$(".image").hide() + this.$(".video").hide() + this.$(".audio").show() + + this.$playButton.toggleClass("paused", ! this.scenery.paused()) + break } return true }, |