summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/WallpaperPicker.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-27 12:23:07 -0400
committerJules Laplace <jules@okfoc.us>2014-10-27 12:23:07 -0400
commit1efe4601867053e297e91e70388b48e90b12b61f (patch)
tree1cae751627860e425050e420c93cb495c84c8de0 /public/assets/javascripts/ui/editor/WallpaperPicker.js
parent50081fb074705175ef860212974213bd4d8cb8a4 (diff)
parente92acfd9a8b7b60544c8b85ad856273c732a1935 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/WallpaperPicker.js')
-rw-r--r--public/assets/javascripts/ui/editor/WallpaperPicker.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 2d60f11..c383489 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -21,7 +21,6 @@ var WallpaperPicker = UploadView.extend({
this.__super__.initialize.call(this)
this.$swatches = this.$(".swatches")
this.$remove = this.$(".wallpaperRemove")
- this.$remove.hide()
this.$url = this.$(".url")
@@ -55,7 +54,7 @@ var WallpaperPicker = UploadView.extend({
// toggle the class that makes the cursor a paintbucket
// $("body").removeClass("pastePaper")
},
-
+
load: function(){
$.get("/api/media/user", { tag: this.mediaTag }, this.populate.bind(this))
},
@@ -108,7 +107,7 @@ var WallpaperPicker = UploadView.extend({
app.tube('cancel-wallpaper')
var $swatch = $(e.currentTarget)
this.follow( e, $swatch.css('background-image') )
- this.$remove.show()
+ this.parent.presets.modified = true
},
remove: function(e){