summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-08 18:10:27 -0400
committerJules Laplace <jules@okfoc.us>2014-10-08 18:10:27 -0400
commit1258966c2879faffc7148b2d58ebc91985c6afc2 (patch)
treebbb284dc0c8481205d4718c7c4f251e1737fd5fc
parent9d10f5c508a748a41bf85333eef620f4388956e7 (diff)
no media warning
-rw-r--r--public/assets/javascripts/ui/editor/MediaUpload.js1
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js4
-rw-r--r--views/controls/editor/media-drawer.ejs1
3 files changed, 5 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 669248e..3f425c3 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -42,7 +42,6 @@ var MediaUpload = UploadView.extend({
}
media._csrf = $("[name=_csrf]").val()
- console.log(media)
var request = $.ajax({
type: "post",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index b51d8f2..1414e16 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,6 +20,7 @@ var MediaViewer = ModalView.extend({
this.$foundMedia = this.$(".foundMedia")
this.$foundToggle = this.$(".foundToggle")
this.$deleteMedia = this.$("#deleteMedia")
+ this.$noMedia = this.$(".noMedia")
},
foundToggle: function(){
@@ -103,9 +104,11 @@ var MediaViewer = ModalView.extend({
data.forEach(function(media){
this.add(media, this.$myMedia)
}.bind(this))
+ this.$noMedia.hide()
this.$deleteMedia.show()
}
else {
+ this.$noMedia.show()
this.$deleteMedia.hide()
}
this.__super__.show.call(this)
@@ -176,6 +179,7 @@ var MediaViewer = ModalView.extend({
if ($(".myMedia .mediaContainer").length == 0) {
this.$deleteMedia.hide()
+ this.$noMedia.show()
this.deleteArmed(false)
}
return
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..dedfbb0 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -20,6 +20,7 @@
<h3 class="editBtn warn" id="deleteMedia"></h3>
<div class="myMedia">
+ <div class="noMedia">You have no media yet. Upload some!</div>
</div>
<div class="foundMedia">