diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-17 12:09:28 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-17 12:09:28 -0400 |
| commit | a3535fefc311d1cbfcdbbd5c844a0979dcf7cfed (patch) | |
| tree | 00d22e8a3908417bb9d52929db9fe90f65f83332 /public/assets/javascripts/rectangles/engine/map/ui_editor.js | |
| parent | b89310359d02d0b886037ff0aa051207476edeff (diff) | |
| parent | 38a948be224d704589fa203520f224615a81c7d9 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/map/ui_editor.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_editor.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index 1a4ea3c..1ab9c73 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -220,7 +220,7 @@ Map.UI.Editor = function(map){ if (intersects.length) { wheelState = wheelState || intersects[0].copy() - intersects[0].height = clamp( ~~(intersects[0].height - deltaY * 2), height_min, height_max ) + intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max ) app.tube("builder-pick-room", intersects[0]) clearTimeout(wheelTimeout) @@ -235,7 +235,7 @@ Map.UI.Editor = function(map){ }, 250) } else { - map.set_zoom(map.zoom_exponent - deltaY/20) + map.set_zoom(map.zoom_exponent + deltaY/20) } } |