summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-07 17:22:57 -0500
committerJules Laplace <jules@okfoc.us>2014-11-07 17:22:57 -0500
commitf007cec1adce5fee283acc165aaab634c1819564 (patch)
treec29fffdd089a399d7170443f291fb62d22da00d5
parent540f547d39c2a8719c501b24c2004dbf2e815454 (diff)
scroll to top of media list after upload
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js2
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js6
2 files changed, 5 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 65778dd..9ae90e3 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -63,7 +63,7 @@ var MediaUpload = UploadView.extend({
},
error: function(error){
- console.log(error)
+ console.log(error)
alert(error.errors.media.message)
},
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
},