summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/WallpaperPicker.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui/editor/WallpaperPicker.js')
-rw-r--r--public/assets/javascripts/ui/editor/WallpaperPicker.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index afdfca7..116b725 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -38,6 +38,7 @@ var WallpaperPicker = UploadView.extend({
// },
toggle: function (state) {
+ Scenery.nextWallpaper = null
app.tube('cancel-wallpaper')
this.$el.toggleClass("active", state)
if (state) {
@@ -134,7 +135,7 @@ var WallpaperPicker = UploadView.extend({
}
function _hideCursor (e) {
$(window).off('mousemove', _followCursor)
- $(window).off('click', _hideCursor)
+ // $(window).off('click', _hideCursor)
app.off('cancel-wallpaper', _hideCursor)
$floatingSwatch.removeClass("scissors").hide()
}
@@ -145,7 +146,7 @@ var WallpaperPicker = UploadView.extend({
_followCursor(e);
})
},
-
+
wall: null,
pickWall: function(wall){
if (! wall.background || wall.background.src == "none") {