summaryrefslogtreecommitdiff
path: root/public/assets/javascripts
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-11-14 22:11:14 -0500
committerJulie Lala <jules@okfoc.us>2014-11-14 22:11:14 -0500
commit84d606cc4c56778ae7e6b8b7d86e100131717a53 (patch)
tree62c2aeeabde149cf930064b7ea0499fa8aea3927 /public/assets/javascripts
parenta68382199889a931e5271e80b4e62a8066d4da23 (diff)
randomize button uses active media pane
Diffstat (limited to 'public/assets/javascripts')
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index f3d75bf..029252d 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -23,7 +23,7 @@ var MediaViewer = ModalView.extend({
this.__super__.initialize.call(this)
this.parent = opt.parent
- this.$myMedia = this.$(".myMedia")
+ this.$myMedia = this.$(".myMedia").addClass('active')
this.$myMediaContainer = this.$(".myMedia > .container")
this.$userToggle = this.$(".userToggle")
@@ -45,7 +45,7 @@ var MediaViewer = ModalView.extend({
wallpaperToggle: function(){
this.$wallpaperMedia.addClass("active")
this.$foundMedia.addClass("inactive")
- this.$myMedia.addClass("inactive")
+ this.$myMedia.addClass("inactive").removeClass('active')
this.$("a").removeClass("active")
this.$foundToggle.addClass("active")
},
@@ -53,7 +53,7 @@ var MediaViewer = ModalView.extend({
foundToggle: function(){
this.$wallpaperMedia.removeClass("active")
this.$foundMedia.addClass("active")
- this.$myMedia.addClass("inactive")
+ this.$myMedia.addClass("inactive").removeClass('active')
this.$("a").removeClass("active")
this.$foundToggle.addClass("active")
},
@@ -61,7 +61,7 @@ var MediaViewer = ModalView.extend({
userToggle: function(){
this.$wallpaperMedia.removeClass("active")
this.$foundMedia.removeClass("active")
- this.$myMedia.removeClass("inactive")
+ this.$myMedia.removeClass("inactive").addClass('active')
this.$("a").removeClass("active")
this.$userToggle.addClass("active")
},
@@ -123,7 +123,7 @@ var MediaViewer = ModalView.extend({
},
randomize: function(){
- var $divs = this.$myMediaContainer.find(".mediaContainer").toArray()
+ var $divs = this.$(".active .container").find(".mediaContainer").toArray()
if ($divs.length < 3) {
$divs = $divs.concat( this.$foundMediaContainer.find(".mediaContainer").toArray() )
}