From 110ef53f228c9e4bd78513cd90bdbbaa2e071b52 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 29 Aug 2014 23:36:05 -0400 Subject: remove wallpaper --- .../javascripts/ui/editor/WallpaperPicker.js | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'public/assets/javascripts/ui') diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index 61ecb78..bcae3c5 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({ events: { "click .swatch": 'pick', + "click .wallpaperRemove": 'remove', }, initialize: function(){ @@ -67,23 +68,34 @@ var WallpaperPicker = UploadView.extend({ pick: function(e){ var $swatch = $(e.currentTarget) + this.follow( e, $swatch.css('background-image') ) + }, + + remove: function(e){ + this.follow( e, "none" ) + $(".floatingSwatch").addClass("scissors") + }, + + follow: function(e, wallpaper, icon){ + icon = icon || wallpaper + var $floatingSwatch = $(".floatingSwatch") - $floatingSwatch.css('background-image', $swatch.css('background-image')) + $floatingSwatch.css('background-image', wallpaper) - Scenery.nextWallpaper = $swatch.css('background-image') + Scenery.nextWallpaper = wallpaper setTimeout(function(){ function _followCursor(e) { $floatingSwatch.css({ top: (e.pageY + 10) + 'px', - left: (e.pageX + 10) + 'px' + left: (e.pageX + 10) + 'px', }); } - $(window).on('mousemove', _followCursor); + $(window).on('mousemove', _followCursor) $(window).one('click', function () { - $(window).off('mousemove', _followCursor); - $floatingSwatch.hide(); + $(window).off('mousemove', _followCursor) + $floatingSwatch.removeClass("scissors").hide() }); $floatingSwatch.show() _followCursor(e); -- cgit v1.2.3-70-g09d2