More Text Tool Updates

1 files changed, 116 insertions, 46 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 dac30da0..55274322 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -32,30 +32,9 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
     prepareForDraw: {
         value: function() {
-            this.linkTarget.items = ["Target","_blank","_self","_parent", "_top"];
-            this.fontSettings.label = "Settings";
-            this.btnBold.label = "Bold";
-            this.btnItalic.label = "Italic";
-            this.btnUnderline.label = "Underline";
-            this.btnStrikethrough.label = "Strikethrough";
-            this.alignLeft.label = "Left";
-            this.alignCenter.label = "Center";
-            this.alignRight.label = "Right";
-            this.alignJustify.label = "Justify";
-            this.indent.label = "-->"
-            this.outdent.label = "<--";
-            this.numberedList.label = "1 2 3";
-            this.bulletedList.label = "• • •";
             this.fontSelection.items = ["Arial", "Arial Black", "Courier New", "Garamond", "Georgia",  "Open Sans", "Tahoma", "Times New Roman", "Trebuchet MS", "Verdana"];
             this.tagType.items = ["div", "span", "p", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"];
-
-
-            this.application.ninja.stage.textTool.addEventListener("editorSelect", this, false);
-            Object.defineBinding(this.application.ninja.stage.textTool.states, "bold", {
-              boundObject: this.btnBold,
-              boundObjectPropertyPath: "value"
-            });
-
+            this.fontSize.items = ["8pt","10pt","12pt","14pt","18pt","24pt","36pt"];
         }
     },
 
@@ -65,10 +44,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
         }
     },
 
-    defaultFontSize: {
-        value: "12px"
-    },
-
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
@@ -82,31 +57,27 @@ exports.TextProperties = Montage.create(ToolProperties, {
         }
     },
 
-    handleFontSizeChange: {
-        
-    },
-
     handleBtnBoldAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("bold", true);
+            this.application.ninja.stage.textTool.doAction("bold");
         }
     },
 
     handleBtnItalicAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("italic", true);
+            this.application.ninja.stage.textTool.doAction("italic");
         }
     },
 
     handleBtnUnderlineAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("underline", true);
+            this.application.ninja.stage.textTool.doAction("underline");
         }
     },
 
     handleBtnStrikethroughAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("strikethrough", true);
+            this.application.ninja.stage.textTool.doAction("strikethrough");
         }
     },
     
@@ -116,7 +87,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
             this.alignCenter.value = false;
             this.alignRight.value = false;
             this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyLeft", true);
+            this.application.ninja.stage.textTool.doAction("justifyleft");
         }
     },
 
@@ -126,7 +97,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
             //this.alignCenter.value = false;
             this.alignRight.value = false;
             this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyCenter", true);
+            this.application.ninja.stage.textTool.doAction("justifycenter");
         }
     },
 
@@ -136,7 +107,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
             this.alignCenter.value = false;
             //this.alignRight.value = false;
             this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyRight", true);
+            this.application.ninja.stage.textTool.doAction("justifyright");
         }
     },
 
@@ -146,37 +117,123 @@ exports.TextProperties = Montage.create(ToolProperties, {
             this.alignCenter.value = false;
             this.alignRight.value = false;
             //this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("strikethrough", null);
+            this.application.ninja.stage.textTool.doAction("justifyfull");
         }
     },
 
     handleIndentAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("indent", null);
+            this.application.ninja.stage.textTool.doAction("indent");
         }
     },
 
     handleOutdentAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("outdent", null);
+            this.application.ninja.stage.textTool.doAction("outdent");
         }
     },
 
     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;
+                }
+            }
         }
     },
 
-    handleFontSizeChanging: {
-        value: function(e) {
+    defineInitialProperties: {
+        value: function() {
+            if (!this.initialized) {
+
+                //Setup Font Selection tool
+                this.fontColor = this.element.getElementsByClassName("fontColor")[0];
+                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: "states.bold",