summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-24 16:59:25 -0400
committerJules Laplace <jules@okfoc.us>2014-10-24 16:59:25 -0400
commit25a60bb0f9e4bd3944bcd3cf88d28056c6b11436 (patch)
tree404c1c08c4698d9e3cb54cf996ff11bd00234eae
parentbf2cfc50970c99898a375da9ff5db3f9925d17b9 (diff)
fix
-rw-r--r--public/assets/javascripts/ui/editor/WallpaperPicker.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 20fdf85..2d60f11 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -155,14 +155,16 @@ var WallpaperPicker = UploadView.extend({
});
}
function _hideCursor (e) {
+ $(window).off('keydown', _floodRoom)
$(window).off('mousemove', _followCursor)
- // $(window).off('click', _hideCursor)
app.off('cancel-wallpaper', _hideCursor)
$floatingSwatch.removeClass("scissors").hide()
$(".floodMessage").hide()
}
function _floodRoom (e) {
- base.flood()
+ if (e.keyCode == 13) {
+ base.flood()
+ }
}
$(window).on('keydown', _floodRoom)
$(window).on('mousemove', _followCursor)