From a3309cb7319c34241be00edef9787fea5004fc67 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 31 Oct 2016 18:59:30 -0400 Subject: toggling map --- public/assets/javascripts/rectangles/engine/map/_map.js | 4 +++- 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){ -- cgit v1.2.3-70-g09d2