diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-07 18:24:57 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-07 18:24:57 -0500 |
| commit | 5b801067f0da66191090465e72d1758826461fd3 (patch) | |
| tree | 8b02ce4443f7e5bbefb59c29ffa9219eaf02a56f /public/assets/javascripts/ui/editor/MediaViewer.js | |
| parent | 22c4fd94cd4b3f5f881f0ad91597b7c208e89eff (diff) | |
| parent | f246a18bf02d2476b5f2bbc87a563b997b384a2c (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaViewer.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaViewer.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 8cae4a4..dd17613 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -154,9 +154,11 @@ var MediaViewer = ModalView.extend({ }, addUploadedMedia: function(media){ - this.parent.mediaViewer.$deleteMedia.show() - this.parent.mediaViewer.$noMedia.hide() + this.$deleteMedia.show() + this.$noMedia.hide() this.add(media, this.$myMedia, true) // prepend + this.userToggle() + this.$el.scrollTop(0) this.offset += 1 }, |