diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-24 16:46:36 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-24 16:46:36 -0400 |
| commit | 79377c1a06e986abb9146f4a9b41e4d266dc8dfc (patch) | |
| tree | 1c0fd0a2dc51c5e87e4579a0711e2e3fd1e08d83 /public/assets/javascripts/ui/editor | |
| parent | 9bc2f0eec1bff31de427c97cbb190a4f7f74a483 (diff) | |
hit enter to flood message
Diffstat (limited to 'public/assets/javascripts/ui/editor')
| -rw-r--r-- | public/assets/javascripts/ui/editor/WallpaperPicker.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index 6e0d5c6..3b6168e 100644 --- a/public/assets/javascripts/ui/editor/WallpaperPicker.js +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -7,6 +7,7 @@ var WallpaperPicker = UploadView.extend({ uploadAction: "/api/media/upload", events: { + "contextmenu": 'cancel', "mousedown": 'stopPropagation', "click .swatch": 'pick', "click .wallpaperRemove": 'remove', @@ -120,6 +121,14 @@ var WallpaperPicker = UploadView.extend({ $(".floatingSwatch").addClass("scissors") } }, + + cancel: function(e){ + if (Scenery.nextWallpaper) { + e.preventDefault() + Scenery.nextWallpaper = null + app.tube('cancel-wallpaper') + } + }, follow: function(e, wallpaper, icon){ icon = icon || wallpaper |