3 files changed, 16 insertions, 7 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index b96943e..2b29961 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -5,6 +5,8 @@ var EditorSettings = FormView.extend({
 	createAction: "/api/project/new",
 	updateAction: "/api/project/edit",
 	destroyAction: "/api/project/destroy",
+	
+	useMinotaur: true,
   
 	events: {
 	  "mousedown": "stopPropagation",
@@ -15,6 +17,7 @@ var EditorSettings = FormView.extend({
 		"click [data-role='clone-project']": 'clone',
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
+		"click [data-role='toggle-map']": 'toggleMap',
     "click #startText": "setStartPosition",
     "click #moveText": "confirmStartPosition",
     "click #confirmText": "setStartPosition",
@@ -81,6 +84,11 @@ var EditorSettings = FormView.extend({
 	  this.parent.collaborators.show()
 	},
 	
+	toggleMap: function(e){
+	  e.preventDefault()
+	  app.controller.toolbar.toggleMap()
+	},
+	
 	clone: function(e){
 		e.preventDefault()
 
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9b81db1..db5878f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -161,7 +161,7 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
-	    if (this.tainted) {
+	    if (this.tainted && this.scenery.media) {
         this.scenery.media.title = this.$name.val()
         this.scenery.media.description = this.$description.val()
         Minotaur.watch( app.router.editorView.settings )
@@ -178,8 +178,11 @@ var MediaEditor = FormView.extend({
 	destroy: function(){
     var scenery = this.scenery
     this.hide()
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+
+    scenery.remove()
+    
+    this.tainted = false
+    this.scenery = null
 	},
 
 })
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index b559ba5..51077af 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -136,10 +136,8 @@ var TextEditor = FormView.extend({
   },
   
 	destroy: function(){
-    var scenery = this.scenery
-    this.hide()
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+    this.tainted = false
+    this.scenery.remove()
 	},
 
 })