diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-07 19:22:42 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-07 19:22:42 -0400 |
| commit | d6d78ddf16e9cb6555e92089dfa77ba5648f686b (patch) | |
| tree | d9e62fa1bdf07cf60fdccfec4cf599e42be9a001 /public/assets/javascripts/ui/reader/MediaPlayer.js | |
| parent | 009205d55b7f04d2a08064a844e5e2b731fff7d8 (diff) | |
| parent | c2e2334328256fa0409341692284f25f3167ab30 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/reader/MediaPlayer.js')
| -rw-r--r-- | public/assets/javascripts/ui/reader/MediaPlayer.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js index df2d075..6195ab6 100644 --- a/public/assets/javascripts/ui/reader/MediaPlayer.js +++ b/public/assets/javascripts/ui/reader/MediaPlayer.js @@ -53,8 +53,8 @@ var MediaPlayer = FormView.extend({ this.bind(scenery) this.$el.addClass("active") - this.$name.html(media.title) - this.$description.html(media.description) + this.$name.html( sanitize(media.title) ) + this.$description.html( marked(media.description) ) switch (media.type) { case "image": |