1 files changed, 55 insertions, 206 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index c5729e98..4f944adf 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -8,13 +8,15 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 var ArrayController = require("montage/ui/controller/array-controller").ArrayController;
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
+var Converter = require("montage/core/converter/converter").Converter;
 
 exports.TextProperties = Montage.create(ToolProperties, {
-    className: {value: null, serializable: true},
-    tagType: {value: null, serializable: true},
-    fontSelection: {value: null, serializable: true},
-    fontSettings: {value: null, serializable: true},
+
+    fontName: {value: null, serializable: true},
     fontSize: {value: null, serializable: true},
+
+    fontSettings: {value: null, serializable: true}, // Note: Isn't used currently will need fontSettings Popup
+
     fontColor: {value: null, serializable: true},
     btnBold: {value: null, serializable: true},
     btnItalic: {value: null, serializable: true},
@@ -33,66 +35,59 @@ exports.TextProperties = Montage.create(ToolProperties, {
     fontTypes: {value: null, serializable: true},
     fontSizes: {value: null, serializable: true},
 
+    // Draw Cycle
     prepareForDraw: {
         value: function() {
-            // code commented out because montage ui element select-input is incomplete. Will switch back when they fix or actually complete the component
-//            this.fontTypes = Montage.create(ArrayController);
-//            this.fontTypes.content = [
-//                { value: "Arial", text: "Arial" },
-//                { value: "Arial Black", text: "Arial Black" },
-//                { value: "Courier New", text: "Courier New" },
-//                { value: "Garamond", text: "Garamond" },
-//                { value: "Georgia", text: "Georgia" },
-//                { value: "Open Sans", text: "Open Sans" },
-//                { value: "Tahoma", text: "Tahoma" },
-//                { value: "Times New Roman", text: "Times New Roman" },
-//                { value: "Trebuchet MS", text: "Trebuchet MS" },
-//                { value: "Verdana", text: "Verdana" }
-//            ];
-
-            //this.fontSelection.contentController = this.fontTypes;
-//
-//            this.fontSizes = Montage.create(ArrayController);
-//            this.fontSizes.content = [
-//                { value: 1, text: "8pt" },
-//                { value: 2, text: "10pt" },
-//                { value: 3, text: "12pt" },
-//                { value: 4, text: "14pt" },
-//                { value: 5, text: "18pt" },
-//                { value: 6, text: "24pt" },
-//                { value: 7, text: "36pt" }
-//            ];
-//            this.fontSize.contentController = this.fontSizes;
-            
-            this.fontSelection.items = ["Arial", "Arial Black", "Courier New", "Garamond", "Georgia",  "Open Sans", "Tahoma", "Times New Roman", "Trebuchet MS", "Verdana"];
-            this.fontSize.items = ["8pt","10pt","12pt","14pt","18pt","24pt","36pt"];
-            this.tagType.items = ["div", "span", "p", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"];
-        }
-    },
 
+            this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80};
+            this.application.ninja.colorController.addButton("chip", this.fontColor);
+            this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'});
+            this.fontColor.addEventListener("change",this.handleFontColorChange.bind(this),false);
+
+            this.application.ninja.stage.textTool.addEventListener("editorSelect", this.handleEditorSelect.bind(this), false);
+
+            //Bind to Rich Text editor that lives on the stage component
+            Object.defineBinding(this.application.ninja.stage.textTool, "fontName", {
+                boundObject: this.fontName,
+                boundObjectPropertyPath: "value",
+                oneway: false
+            });
+
+            Object.defineBinding(this.application.ninja.stage.textTool, "fontSize", {
+                boundObject: this.fontSize,
+                boundObjectPropertyPath: "value",
+                oneway: false
+            });
+
+            Object.defineBinding(this.btnBold, "pressed", {
+                boundObject: this.application.ninja.stage.textTool,
+                boundObjectPropertyPath: "bold",
+                oneway: false
+            });
+
+            Object.defineBinding(this.btnItalic, "pressed", {
+                boundObject: this.application.ninja.stage.textTool,
+                boundObjectPropertyPath: "italic",
+                oneway: false
+            });
+
+            Object.defineBinding(this.btnUnderline, "pressed", {
+                boundObject: this.application.ninja.stage.textTool,
+                boundObjectPropertyPath: "underline",
+                oneway: false
+            });
+
+            Object.defineBinding(this.btnStrikethrough, "pressed", {
+                boundObject: this.application.ninja.stage.textTool,
+                boundObjectPropertyPath: "strikeThrough",
+                oneway: false
+            });
+        }
+    },
+
+    // Events
     handleEditorSelect: {
         value: function(e) {
-            //this.application.ninja.stage.textTool.updateStates();
-//            this.fontSelection.value = this.application.ninja.stage.textTool.states.fontname;
-//
-//            for( var i = 0; i < this.fontSize.items.length; i++) {
-//                if (this.application.ninja.stage.textTool.states.fontsize == i + 1) {
-//                    this.fontSize.value = this.fontSize.items[i]
-//                    break;
-//                }
-//            }
-        }
-    },
-
-    _subPrepare: {
-        value: function() {
-            //this.divElement.addEventListener("click", this, false);
-        }
-    },
-
-    handleClick: {
-        value: function(event) {
-           // this.selectedElement = event._event.target.id;
 
         }
     },
@@ -161,158 +156,12 @@ exports.TextProperties = Montage.create(ToolProperties, {
         }
     },
 
-    handleFontSizeChange: {
-        value: function(e) {
-            //We need the index of whats selected. This is a temporary solution til we can have a variable amount for font-size.
-            for( var i = 0; i < this.fontSize.items.length; i++) {
-                if (this.fontSize.value === this.fontSize.items[i]) {
-                    this.application.ninja.stage.textTool.doAction("fontsize", (i +1));
-                    break;
-                }
-            }
-        }
-    },
-
-    defineInitialProperties: {
-        value: function() {
-            if (!this.initialized) {
-
-                //Setup Font Selection tool
-                this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80};
-                this.application.ninja.colorController.addButton("chip", this.fontColor);
-                this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'});
-                this.fontColor.addEventListener("change",this.handleFontColorChange.bind(this),false);
-
-                this.application.ninja.stage.textTool.addEventListener("editorSelect", this, false);
-
-                Object.defineBinding(this.btnBold, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "bold",
-                  oneway: false
-                });
-
-                Object.defineBinding(this.btnItalic, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "italic",
-                  oneway: false
-                });
-
-                Object.defineBinding(this.btnUnderline, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "underline",
-                  oneway: false
-                });
-
-                Object.defineBinding(this.btnStrikethrough, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "strikeThrough",
-                  oneway: false
-                });
-