diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-10 21:07:55 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-10 21:07:55 -0400 |
| commit | 6177755e842ca3028833bc98ba0e97e6874b27fb (patch) | |
| tree | 7bbe15aa18c497e256f3bbc6e89316221659137a /public/assets/javascripts/rectangles/engine/map | |
| parent | b35bda803440233b68389603bbaced53f8bb18ba (diff) | |
| parent | bc63a639bbd224adfc8012b100c1b277e2774afb (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/map')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_minimap.js | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index 02218ed..3c3347b 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -213,7 +213,7 @@ Map.UI.Editor = function(map){ undo: wheelState, redo: intersects[0].copy() }) - Rooms.clipper.update() + Rooms.rebuild() wheelState = null }, 500) } diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js index d7280b9..fabbdb9 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js @@ -7,7 +7,6 @@ Map.UI.Minimap = function(map){ base.creating = base.dragging = base.resizing = false -/* base.mouse = new mouse({ el: map.el, down: down, @@ -16,7 +15,6 @@ Map.UI.Minimap = function(map){ up: up, rightclick: rightclick, }) -*/ base.wheel = new wheel({ el: map.el, |