diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-21 14:08:42 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-21 14:08:42 -0400 |
| commit | 7d053a335808c8c07dffab7edd259c5da37efb5d (patch) | |
| tree | b7a6855c490a130b3cf84f1dd03f59a60b3b285e /public/assets/javascripts/ui/editor | |
| parent | 3b0962d1d07ed4aa74536e3323feed1a2dbc5643 (diff) | |
| parent | d80ba1570ecf6e5fdb16d24c6f0ad189492a8bd8 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor')
| -rw-r--r-- | public/assets/javascripts/ui/editor/WallpaperPicker.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index 994fe74..6e0d5c6 100644 --- a/public/assets/javascripts/ui/editor/WallpaperPicker.js +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -40,9 +40,6 @@ var WallpaperPicker = UploadView.extend({ hide: function(){ this.toggle(false) }, -// hide: function(){ -// this.__super__.hide.call(this) -// }, toggle: function (state) { Scenery.nextWallpaper = null @@ -158,6 +155,7 @@ var WallpaperPicker = UploadView.extend({ pickWall: function(wall){ if (! wall.background || wall.background.src == "none") { this.$wallpaperResizeControls.addClass('disabled') + this.$scale.val( 0.0 ) return; } this.$wallpaperResizeControls.removeClass('disabled') |