3 files changed, 56 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index bb4b145..513306d 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -10,7 +10,7 @@ var EditorToolbar = View.extend({
 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
-		"click [data-role='edit-wall-text']": 'editWallText',
+		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
 	},
 	
 	initialize: function(opt){
@@ -24,6 +24,7 @@ var EditorToolbar = View.extend({
 	
 	toggleSettings: function(){
 // 	  this.resetMode()
+    this.parent.textEditor.hide()
 		this.parent.lightControl.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.mediaEditor.hide()
@@ -47,6 +48,7 @@ var EditorToolbar = View.extend({
 	
 	resetControls: function(){
 	  $(".inuse").removeClass("inuse")
+    this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
@@ -107,6 +109,7 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.lightControl.hide()
+    this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.wallpaperPicker.toggle(state)
 	},
@@ -117,12 +120,20 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-light-control']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
+    this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.lightControl.toggle(state)
 	},
 	
-	editWallText: function(){
-	},
+	toggleTextEditor: function(){
+		var state = ! $("[data-role='toggle-text-editor']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-text-editor']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
+		this.parent.wallpaperPicker.hide()
+		this.parent.settings.hide()
+		this.parent.textEditor.toggle(state)
+  },
 
 })
 
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 6636a8c..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 })
 	},
 
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
new file mode 100644
index 0000000..0319a31
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -0,0 +1,41 @@
+
+var TextEditor = FormView.extend({
+	el: "#textEditor",
+		
+	events: {
+		"keydown": 'taint',
+		"focus [name]": "clearMinotaur",
+		"mousedown": "stopPropagation",
+		"change [name=font-family]": 'changeFontFamily',
+		"change [name=font-size]": 'changeFontSize',
+		"input [name=text-body]": 'changeText',
+		"click [data-role=destroy-media]": "destroy",
+	},
+	
+	initialize: function(opt){
+		this.parent = opt.parent
+		this.__super__.initialize.call(this)
+    
+    this.$fontFamily = this.$("[name=font-family]")
+    this.$fontSize = this.$("[name=font-size]")
+    this.$textBody = this.$("[name=text-body]")
+	},
+
+  toggle: function(state){
+    this.$el.toggleClass("active", state);
+  },
+  
+  taint: function(e){
+    e.stopPropagation()
+  },
+  
+  changeFontFamily: function(){
+  },
+  
+  changeFontSize: function(){
+  },
+  
+  changeText: function(){
+  },
+
+})