diff options
| author | Jules Laplace <jules@okfoc.us> | 2016-10-31 18:59:30 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2016-10-31 18:59:30 -0400 |
| commit | a3309cb7319c34241be00edef9787fea5004fc67 (patch) | |
| tree | 5cc9ccc091d4c6bc2860de2b44eadaa86ef66141 | |
| parent | a9c9d6adf470d0966e6c6bef0803e298fd2d4117 (diff) | |
toggling map
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/_map.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorView.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js index ba3ec92..64eb2b2 100644 --- a/public/assets/javascripts/rectangles/engine/map/_map.js +++ b/public/assets/javascripts/rectangles/engine/map/_map.js @@ -54,7 +54,9 @@ var Map = function(opt){ } base.toggle = function(state){ - return $(base.el).toggle(state).is(':visible') + $(base.el).toggle(state) + $(base.el).parent().toggle(state) + return state } var canvas = base.canvas = document.createElement("canvas") diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index c05b373..b331c16 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -47,12 +47,11 @@ var EditorView = View.extend({ }, ready: function(data){ - $("#map").hide() - this.data = data this.settings.load(data) this.info.load(data) + this.toolbar.toggleMap(false) }, readyLayout: function(data){ |