diff options
| author | ryderr <r@okfoc.us> | 2014-10-22 15:31:55 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-22 15:31:55 -0400 |
| commit | da58eb25d6bfe14f8d73945afd1905fa9effe3d7 (patch) | |
| tree | a97ca334b89a2f03737e3e5ea1b94e6002e9165d /public/assets/javascripts/ui/editor/WallpaperPicker.js | |
| parent | 392bdf16047617bf4a3b99fa2dd7792134b9e3e0 (diff) | |
| parent | 8ee5078b472cf6be20dc6d9105cc687f205fd698 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/WallpaperPicker.js')
| -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') |