merge

1 files changed, 5 insertions, 2 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index e11f189..83db532 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -16,6 +16,7 @@ var EditorView = View.extend({
 		this.mediaEditor = new MediaEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
+		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
 	},
 
@@ -31,7 +32,7 @@ var EditorView = View.extend({
 	
 	ready: function(data){
 		$("#map").hide()
-		
+
 		this.settings.load(data)
 	},
 	
@@ -46,6 +47,8 @@ var EditorView = View.extend({
 	
 	hideExtras: function(){
 		this.mediaEditor.hide()
-	}
+    Scenery.resize.hide()
+		Scenery.hovering = false
+  }
 
 })