From 8966fc4903f0eec61816d9b9bdbcac9b7d99c320 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 2 Jul 2012 13:19:00 -0700
Subject: Bug: Font Name & Size not updating text tool

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../text-properties.reel/text-properties.css       |   4 +
 .../text-properties.reel/text-properties.html      | 120 +++++-----
 .../text-properties.reel/text-properties.js        | 261 +++++----------------
 3 files changed, 112 insertions(+), 273 deletions(-)

(limited to 'js/components/tools-properties')

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 586cdcd5..7ab3ae9a 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,6 +39,10 @@
     width: 160px;
 }
 
+.optionsTextTool .montage-button:hover {
+    color:#FFF;
+}
+
 .fontColorChipContainer {
     margin-left: 10px !important;
     margin-right: 0px;
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 8899ff3c..6a94cf0a 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -11,79 +11,87 @@
 
         <script type="text/montage-serialization">
         {
-
             "owner": {
                 "prototype": "js/components/tools-properties/text-properties.reel",
                 "properties": {
                     "element": {"#": "textProperties"},
-                    "className": {"@": "className"},
-                    "tagType": {"@": "tagType"},
-                    "fontSelection": {"@": "fontSelection"},
-                    "fontSettings": {"@": "fontSettings"},
-                    "fontSize": {"@": "fontSize"},
+
+                    "fontName": {"@": "fontname"},
+                    "fontSize": {"@": "fontsize"},
                     "fontColor": {"#": "fontColorCtrl"},
+
                     "btnBold": {"@": "btnBold"},
                     "btnItalic": {"@": "btnItalic"},
                     "btnUnderline": {"@": "btnUnderline"},
                     "btnStrikethrough": {"@": "btnStrikethrough"},
+
                     "alignLeft": {"@": "alignLeft"},
                     "alignCenter": {"@": "alignCenter"},
                     "alignRight": {"@": "alignRight"},
                     "alignJustify": {"@": "alignJustify"},
+
                     "indent": {"@": "indent"},
                     "outdent": {"@": "outdent"},
+
                     "numberedList": {"@": "numberedList"},
                     "bulletedList": {"@": "bulletedList"}
                 }
             },
-            "className": {
-                "prototype": "js/components/textfield.reel[TextField]",
+
+            "fontname": {
+                "prototype": "montage/ui/native/select.reel",
                 "properties": {
-                    "element": {"#": "className"}
+                    "element": {"#": "fontname"},
+                    "preventFocus": true,
+                    "contentController": {"@": "fontnameController"}
                 }
             },
-            "tagType": {
-                "prototype": "js/components/combobox.reel",
+
+            "fontnameController": {
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
-                    "element": {"#": "tagType"}
+                    "selectObjectsOnAddition": false,
+                    "content": [
+                        {"text" : "Arial", "value": "Arial"},
+                        {"text" : "Arial Black", "value": "Arial Black"},
+                        {"text" : "Courier New", "value": "Courier New"},
+                        {"text" : "Garamond", "value": "Garamond"},
+                        {"text" : "Georgia", "value": "Georgia"},
+                        {"text" : "Open Sans", "value": "Open Sans"},
+                        {"text" : "Tahoma", "value": "Tahoma"},
+                        {"text" : "Times New Roman", "value": "Times New Roman"},
+                        {"text" : "Times", "value": "Times"},
+                        {"text" : "Trebuchet", "value": "Trebuchet MS"},
+                        {"text" : "Verdana", "value": "Verdana"}
+                    ]
                 }
             },
-            "fontSelection": {
-                "prototype": "js/components/combobox.reel",
-                "properties": {
-                    "element": {"#": "fontSelection"},
-                    "identifier": "fontSelection"
-                },
-                "listeners": [
-                    {
-                        "type": "change",
-                        "listener": {"@": "owner"}
-                    }
-                ]
 
-            },
-            "fontSettings": {
-                "prototype": "montage/ui/button.reel",
+            "fontsize": {
+                "prototype": "montage/ui/native/select.reel",
                 "properties": {
-                    "element": {"#": "fontSettings"}
+                    "element": {"#": "fontSize"},
+                    "preventFocus" : true,
+                    "contentController" : {"@": "fontsizeController"}
                 }
             },
 
-            "fontSize": {
-                "prototype": "js/components/combobox.reel",
+            "fontsizeController": {
+                "prototype": "montage/ui/controller/array-controller",
                 "properties": {
-                    "element": {"#": "fontSize"},
-                    "identifier": "fontSize"
-                },
-                "listeners": [
-                    {
-                        "type": "change",
-                        "listener": {"@": "owner"}
-                    }
-                ]
-
+                    "selectObjectsOnAddition": false,
+                    "content": [
+                        {"text" : "8pt", "value": "1"},
+                        {"text" : "10pt", "value": "2"},
+                        {"text" : "12pt", "value": "3"},
+                        {"text" : "14pt", "value": "4"},
+                        {"text" : "18pt", "value": "5"},
+                        {"text" : "24pt", "value": "6"},
+                        {"text" : "36pt", "value": "7"}
+                    ]
+                }
             },
-        
+
             "btnBold": {
                 "prototype": "montage/ui/toggle-button.reel",
                 "properties": {
@@ -103,13 +111,7 @@
                     "identifier": "btnItalic",
                     "pressedLabel": "I",
                     "unpressedLabel": "I"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                }
             },
             "btnUnderline": {
                 "prototype": "montage/ui/toggle-button.reel",
@@ -119,13 +121,7 @@
                     "identifier": "btnUnderline",
                     "pressedLabel": "U",
                     "unpressedLabel": "U"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                }
             },
             "btnStrikethrough": {
                 "prototype": "montage/ui/toggle-button.reel",
@@ -135,13 +131,7 @@
                     "identifier": "btnStrikethrough",
                     "pressedLabel": "S",
                     "unpressedLabel": "S"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                }
             },
             
             "alignLeft": {
@@ -276,12 +266,8 @@
 
     <body>
         <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool toolOptionsFloatChildren">
-            <label class="label" style="display: none">Class:</label>
-            <input data-montage-id="className" style="display: none" />
-            <label class="label" style="display: none">Tag:</label>
-            <select data-montage-id="tagType" style="display: none"></select>
             <label class="label overrideMargin">Font:</label>
-            <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select>
+            <select data-montage-id="fontname" class="nj-skinned fontSelection"></select>
             <button data-montage-id="fontSettings" style="display: none"></button>
             <label class="label">Size:</label>
             <select data-montage-id="fontSize" class="nj-skinned"></select>
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
-                });
-
-                Object.defineBinding(this.alignLeft, "pressed", {
-                  boundObject: this.application.ninja.stage.textTool,
-                  boundObjectPropertyPath: "justify",
-                  boundValueMutator: this.validateJustify,
-                  oneway: false
-                });
-//
-//                Object.defineBinding(this.alignCenter, "pressed", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "justifycenter",
-//                  boundValueMutator: this.validatePressed,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.alignRight, "pressed", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "justifyright",
-//                  boundValueMutator: this.validatePressed,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.alignJustify, "pressed", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "justifyfull",
-//                  boundValueMutator: this.validatePressed,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.numberedList, "pressed", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "insertorderedlist",
-//                  boundValueMutator: this.validatePressed,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.bulletedList, "pressed", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "insertunorderedlist",
-//                  boundValueMutator: this.validatePressed,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.fontSelection, "value", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "fontname",
-//                  boundValueMutator: this.validateFont,
-//                  oneway: true
-//                });
-//
-//                Object.defineBinding(this.fontSize, "value", {
-//                  boundObject: this.application.ninja.stage.textTool,
-//                  boundObjectPropertyPath: "states.fontsize",
-//                  boundValueMutator: this.validateFontSize.bind(this),
-//                  oneway: true
-//                });
-
-                this.initialized = true;
-            }
-
-        }
-    },
-
-    validatePressed: {
-        value: function(val) {
-            if (val == "true") return true; else return false
-        }
-    },
-
-    validateFont: {
-        value: function(val) {
-            return val;
-        }
-    },
-
-    validateFontSize: {
-        value: function(val) {
-            val = parseInt(val);
-            return this.fontSize.items[val - 1];
-        }
-    },
-
-    initialized: {
-        value: false
-    },
-
-    handleFontSelectionChange: {
-        value: function(e) {
-            this.application.ninja.stage.textTool.element.focus();
-            this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
-
-            //Note: Set Font Color on selection to ColorChip Component;
-            //this.this.application.ninja.stage.textTool.foreColor
-
-        }
-    },
 
     handleFontColorChange: {
         value: function(e) {
             this.application.ninja.stage.textTool.foreColor = e._event.color.css;
-            this.application.ninja.stage.textTool.element.focus();
-            //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css);
-
         }
     }
 
+});
 
-});
\ No newline at end of file
-- 
cgit v1.2.3


From 3d3e37c55e96b74c6c0a2841574fb03814d52999 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 3 Jul 2012 12:19:56 -0700
Subject: Text Tool 2

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 .../text-properties.reel/text-properties.html      |  73 ++++--------
 .../text-properties.reel/text-properties.js        | 128 +++++++++++++--------
 2 files changed, 108 insertions(+), 93 deletions(-)

(limited to 'js/components/tools-properties')

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 6a94cf0a..e0edfdd6 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -139,31 +139,28 @@
                 "properties": {
                     "element": {"#": "alignLeft"},
                     "pressedClass": "active",
-                    "identifier": "alignLeft",
+                    "identifier": "justifyLeft",
                     "pressedLabel": "",
-                    "unpressedLabel": ""
+                    "unpressedLabel": "",
+                    "pressed": false
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
+
             "alignCenter": {
                 "prototype": "montage/ui/toggle-button.reel",
                 "properties": {
                     "element": {"#": "alignCenter"},
                     "pressedClass": "active",
-                    "identifier": "alignCenter",
+                    "identifier": "justifyCenter",
                     "pressedLabel": "",
-                    "unpressedLabel": ""
+                    "unpressedLabel": "",
+                    "pressed": false
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "alignRight": {
@@ -171,15 +168,13 @@
                 "properties": {
                     "element": {"#": "alignRight"},
                     "pressedClass": "active",
-                    "identifier": "alignRight",
+                    "identifier": "justifyRight",
                     "pressedLabel": "",
-                    "unpressedLabel": ""
+                    "unpressedLabel": "",
+                    "pressed": false
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "alignJustify": {
@@ -187,43 +182,33 @@
                 "properties": {
                     "element": {"#": "alignJustify"},
                     "pressedClass": "active",
-                    "identifier": "alignJustify",
+                    "identifier": "justify",
                     "pressedLabel": "",
-                    "unpressedLabel": ""
+                    "unpressedLabel": "",
+                    "pressed": false
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "indent": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "indent"},
-                    "identifier": "indent",
-                    "value": ">>"
+                    "identifier": "indent"
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "outdent": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "outdent"},
-                    "identifier": "outdent",
-                    "value": "<<"
+                    "identifier": "outdent"
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "bulletedList": {
@@ -236,10 +221,7 @@
                     "unpressedLabel": "• • •"
                 },
                 "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
+                    { "type": "action", "listener": {"@": "owner"} }
                 ]
             },
             "numberedList": {
@@ -251,12 +233,7 @@
                     "pressedLabel": "1 2 3",
                     "unpressedLabel": "1 2 3"
                 },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                "listeners": [ { "type": "action", "listener": {"@": "owner"} } ]
             }
 
     	}
@@ -285,8 +262,8 @@
                 <button data-montage-id="alignJustify" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignJustified.png"  class="unselectable"/></button>
             </div>
             <div class="btnGroup toolOptionsFloatChildren">
-                <button data-montage-id="indent" class="nj-skinned textButton"></button>
-                <button data-montage-id="outdent" class="nj-skinned textButton"></button>
+                <button data-montage-id="indent" class="nj-skinned textButton"><img src="../../../../images/optionsbar/text/IndentMore.png" class="unselectable" style="height:16px" /></button>
+                <button data-montage-id="outdent" class="nj-skinned textButton"><img src="../../../../images/optionsbar/text/IndentLess.png" class="unselectable" style="height:16px" /></button>
             </div>
             <div class="btnGroup toolOptionsFloatChildren">
                 <button data-montage-id="bulletedList" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/BulletedList.png" /></button>
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 4f944adf..126665e2 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -8,32 +8,70 @@ 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, {
 
     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},
     btnUnderline: {value: null, serializable: true},
     btnStrikethrough: {value: null, serializable: true},
-    txtLink: {value: null, serializable: true},
-    linkTarget: {value: null, serializable: true},
+
     alignLeft: {value: null, serializable: true},
     alignCenter: {value: null, serializable: true},
     alignRight: {value: null, serializable: true},
     alignJustify: {value: null, serializable: true},
+
     indent: {value: null, serializable: true},
     outdent: {value: null, serializable: true},
+
     numberedList: {value: null, serializable: true},
     bulletedList: {value: null, serializable: true},
-    fontTypes: {value: null, serializable: true},
-    fontSizes: {value: null, serializable: true},
+
+    // Events
+    handleEditorSelect: {
+        value: function(e) {
+            this.alignLeft.pressed = false;
+            this.alignCenter.pressed = false;
+            this.alignRight.pressed = false;
+            this.alignJustify.pressed = false;
+            this.bulletedList.pressed = false;
+            this.numberedList.pressed = false;
+
+
+            switch(this.application.ninja.stage.textTool.justify) {
+                case "left":
+                    this.alignLeft.pressed = true;
+                    break;
+                case "center":
+                    this.alignCenter.pressed = true;
+                    break;
+                case "right":
+                    this.alignRight.pressed = true;
+                    break;
+                case "full":
+                    this.alignJustify.pressed = true;
+            }
+
+            switch(this.application.ninja.stage.textTool.listStyle) {
+                case "ordered":
+                    this.numberedList.pressed = true;
+                    break;
+                case "unordered":
+                    this.bulletedList.pressed = true;
+            }
+        }
+    },
+
+    handleEditorBlur: {
+        value: function(e) {
+
+        }
+    },
+
 
     // Draw Cycle
     prepareForDraw: {
@@ -46,6 +84,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
             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,
@@ -85,83 +124,82 @@ exports.TextProperties = Montage.create(ToolProperties, {
         }
     },
 
-    // Events
-    handleEditorSelect: {
-        value: function(e) {
-
-        }
-    },
-    
-    handleAlignLeftAction: {
+    // Actions
+    handleJustifyLeftAction: {
         value: function(e) {
-            //this.alignLeft.value = false;
-            this.alignCenter.value = false;
-            this.alignRight.value = false;
-            this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyleft");
+            this.alignCenter.pressed = false;
+            this.alignRight.pressed = false;
+            this.alignJustify.pressed = false;
+            this.application.ninja.stage.textTool.justify = "left";
         }
     },
 
-    handleAlignCenterAction: {
+    handleJustifyCenterAction: {
         value: function(e) {
-            this.alignLeft.value = false;
-            //this.alignCenter.value = false;
-            this.alignRight.value = false;
-            this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifycenter");
+            this.alignLeft.pressed = false;
+            this.alignRight.pressed = false;
+            this.alignJustify.pressed = false;
+            this.application.ninja.stage.textTool.justify = "center"
         }
     },
 
-    handleAlignRightAction: {
+    handleJustifyRightAction: {
         value: function(e) {
-            this.alignLeft.value = false;
-            this.alignCenter.value = false;
-            //this.alignRight.value = false;
-            this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyright");
+            this.alignLeft.pressed = false;
+            this.alignCenter.pressed = false;
+            this.alignJustify.pressed = false;
+            this.application.ninja.stage.textTool.justify = "right";
         }
     },
 
-    handleAlignJustifyAction: {
+    handleJustifyAction: {
         value: function(e) {
-            this.alignLeft.value = false;
-            this.alignCenter.value = false;
-            this.alignRight.value = false;
-            //this.alignJustify.value = false;
-            this.application.ninja.stage.textTool.doAction("justifyfull");
+            this.alignLeft.pressed = false;
+            this.alignCenter.pressed = false;
+            this.alignRight.pressed = false;
+            this.application.ninja.stage.textTool.justify = "full";
         }
     },
 
     handleIndentAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("indent");
+            this.application.ninja.stage.textTool.indent();
         }
     },
 
     handleOutdentAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("outdent");
+            this.application.ninja.stage.textTool.outdent();
         }
     },
 
     handleBulletedListAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("insertunorderedlist");
+            this.numberedList.pressed = false;
+            if(e._currentTarget.pressed) {
+                this.application.ninja.stage.textTool.listStyle = "unordered";
+            } else {
+                this.application.ninja.stage.textTool.listStyle = "none";
+            }
         }
     },
 
     handleNumberedListAction: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("insertorderedlist");
+            this.bulletedList.pressed = false;
+            if(e._currentTarget.pressed) {
+                this.application.ninja.stage.textTool.listStyle = "ordered";
+            } else {
+                this.application.ninja.stage.textTool.listStyle = "none";
+            }
         }
     },
 
 
     handleFontColorChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.foreColor = e._event.color.css;
+            this.application.ninja.stage.textTool.element.style.color = e._event.color.css;
         }
     }
 
 });
-
-- 
cgit v1.2.3


From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs

---
 .../tools-properties/binding-properties.reel/binding-properties.html  | 4 ++--
 .../tools-properties/brush-properties.reel/brush-properties.html      | 4 ++--
 .../tools-properties/eraser-properties.reel/eraser-properties.html    | 4 ++--
 .../eyedropper-properties.reel/eyedropper-properties.html             | 4 ++--
 .../tools-properties/fill-properties.reel/fill-properties.html        | 2 +-
 .../ink-bottle-properties.reel/ink-bottle-properties.css              | 2 +-
 .../tools-properties/line-properties.reel/line-properties.html        | 4 ++--
 .../object3d-properties.reel/object3d-properties.html                 | 4 ++--
 .../tools-properties/oval-properties.reel/oval-properties.html        | 4 ++--
 .../tools-properties/pan-properties.reel/pan-properties.html          | 4 ++--
 .../tools-properties/rect-properties.reel/rect-properties.html        | 4 ++--
 .../rotate-stage-properties.reel/rotate-stage-properties.html         | 4 ++--
 .../selection-properties.reel/selection-properties.html               | 2 +-
 .../tools-properties/shape-properties.reel/shape-properties.html      | 4 ++--
 .../tools-properties/tag-properties.reel/tag-properties.html          | 4 ++--
 .../tools-properties/text-properties.reel/text-properties.html        | 4 ++--
 .../tools-properties/zoom-properties.reel/zoom-properties.html        | 4 ++--
 17 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'js/components/tools-properties')

diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 8271ff20..2269850c 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.html
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -42,8 +42,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "bindingProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
       
     </head>
 
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 5645b239..5d970798 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -98,8 +98,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "_angleLabel": {"#": "angleLabel"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index 7148d1c2..d9ebe6bc 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -42,8 +42,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "eraserProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
         
     </head>
 
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 022e7bd0..f2573df9 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -42,8 +42,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "eyedropperProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
        
     </head>
 
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index 948f44bb..31cfab04 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -81,7 +81,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     "fillMaterial": {"@": "fillMaterial"}
                 }
             }
-    	}
+        }
         </script>
 
     </head>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
index 6c57ede7..33074d73 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css
@@ -30,5 +30,5 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 .inkBottleOptions select.nj-skinned {
-	margin-top: 2px;
+    margin-top: 2px;
 }
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html
index d119e8da..8c37fe10 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.html
+++ b/js/components/tools-properties/line-properties.reel/line-properties.html
@@ -41,8 +41,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "lineProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 93d1abfe..268fab83 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -47,8 +47,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index c60ba2a0..c9dc3749 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "innerRadius": {"@": "hottext1"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
     </head>
 
     <body>
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html
index 90b76f75..82eb1d40 100755
--- a/js/components/tools-properties/pan-properties.reel/pan-properties.html
+++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html
@@ -42,8 +42,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "panProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index e2161e9b..ad8c40dc 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -125,8 +125,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "BRRadiusControl": {"@": "hottext4"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
index 2ba82600..08418d31 100755
--- a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
+++ b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
@@ -42,8 +42,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "element": {"#": "rotateStageProperties"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
         
     </head>
 
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index c94c0b6d..239f24b0 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     "arrangeSendToBack": {"#": "arrangeSendToBackBtn"}
                 }
             }
-    	}
+        }
         </script>
 
     </head>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index b796b616..220a91a3 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -147,8 +147,8 @@ POSSIBILITY OF SUCH DAMAGE.
                 }
 
             }
-    	}
-	    </script>
+        }
+        </script>
 
      
     </head>
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index a69ea94e..a1cc8b4f 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -55,8 +55,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "customLabel": {"#": "customContainer"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
        
     </head>
 
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index 6784e41c..6465227f 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -293,8 +293,8 @@ POSSIBILITY OF SUCH DAMAGE.
                 ]
             }
 
-    	}
-	    </script>
+        }
+        </script>
 
     </head>
 
diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
index 3cc3c2bb..e2ad5598 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.html
@@ -44,8 +44,8 @@ POSSIBILITY OF SUCH DAMAGE.
                     "zoomOut": {"#": "zoomOutTool"}
                 }
             }
-    	}
-	    </script>
+        }
+        </script>
       
     </head>
 
-- 
cgit v1.2.3


From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces

---
 .../tools-properties/eraser-properties.reel/eraser-properties.js    | 2 +-
 .../eyedropper-properties.reel/eyedropper-properties.js             | 2 +-
 .../tools-properties/line-properties.reel/line-properties.js        | 2 +-
 .../tools-properties/oval-properties.reel/oval-properties.js        | 6 +++---
 .../tools-properties/pan-properties.reel/pan-properties.js          | 2 +-
 .../tools-properties/pen-properties.reel/pen-properties.js          | 2 +-
 .../tools-properties/rect-properties.reel/rect-properties.js        | 2 +-
 .../rotate-stage-properties.reel/rotate-stage-properties.js         | 2 +-
 .../tools-properties/shape-properties.reel/shape-properties.js      | 2 +-
 .../tools-properties/tag-properties.reel/tag-properties.js          | 2 +-
 .../tools-properties/text-properties.reel/text-properties.js        | 4 ++--
 js/components/tools-properties/tool-properties.js                   | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'js/components/tools-properties')

diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
index 5c997ee3..dbab798a 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 exports.EraserProperties = Montage.create(ToolProperties, {
 
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
index e788b5f6..3442f95c 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 exports.EyedropperProperties = Montage.create(ToolProperties, {
 
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js
index 96938457..499ad880 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.js
+++ b/js/components/tools-properties/line-properties.reel/line-properties.js
@@ -37,7 +37,7 @@ exports.LineProperties = Montage.create(ToolProperties, {
         value: null,
         serializable: true
     },
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js
index dabe646f..195f5f97 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.js
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -41,7 +41,7 @@ exports.OvalProperties = Montage.create(ToolProperties, {
         value: null,
         serializable: true
     },
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
@@ -66,11 +66,11 @@ exports.OvalProperties = Montage.create(ToolProperties, {
     use3D: {
         get: function() { return this.base._use3D; }
     },
-    
+
     strokeSize: {
         get: function() { return this.base._strokeSize; }
     },
-    
+
     strokeStyle : {
         get: function() {
 //            return this.base._strokeStyle.options[this.base._strokeStyle.value].text;
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.js b/js/components/tools-properties/pan-properties.reel/pan-properties.js
index 920c6bc6..cb782af4 100755
--- a/js/components/tools-properties/pan-properties.reel/pan-properties.js
+++ b/js/components/tools-properties/pan-properties.reel/pan-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 exports.PanProperties = Montage.create(ToolProperties, {
 
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js
index 460c9633..66260ac3 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -108,7 +108,7 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
 
     strokeSize: {
         get: function () {
-            return this._strokeSize; 
+            return this._strokeSize;
         }
     },
 
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index 53539113..faf6ee7b 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -76,7 +76,7 @@ exports.RectProperties = Montage.create(ToolProperties, {
     use3D: {
         get: function() { return this.base._use3D; }
     },
-    
+
     strokeSize: {
         get: function() { return this.base._strokeSize; }
     },
diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js
index c87e87c8..af399e7a 100755
--- a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js
+++ b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js
@@ -34,7 +34,7 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 exports.RotateStageProperties = Montage.create(ToolProperties, {
 
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index f812f1bf..d10d2870 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -206,7 +206,7 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                     this._fillColorCtrlContainer.style["display"] = "none";
                     this._fillColorCtrlContainer.visible = false;
                     this._fillColorCtrlIcon.style["display"] = "none";
-                    this._fillColorCtrlIcon.visible = false;                    
+                    this._fillColorCtrlIcon.visible = false;
                     this.endDivider.style["display"] = "none";
                 } else {
                     this._fillColorCtrlContainer.style["display"] = "";
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js
index ce122681..58d70105 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.js
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js
@@ -74,7 +74,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, {
         value: function() {
             this.customName.style["display"] = "none";
             this.customLabel.style["display"] = "none";
-            
+
             this.divElement.addEventListener("click", this, false);
             this.imageElement.addEventListener("click", this, false);
             this.videoElement.addEventListener("click", this, false);
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 0cfa6c4c..a3adbb1d 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -87,7 +87,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
 //                { 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"];
@@ -120,7 +120,7 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
         }
     },
-    
+
     handleAlignLeftAction: {
         value: function(e) {
             //this.alignLeft.value = false;
diff --git a/js/components/tools-properties/tool-properties.js b/js/components/tools-properties/tool-properties.js
index 58c2b052..51d18d21 100755
--- a/js/components/tools-properties/tool-properties.js
+++ b/js/components/tools-properties/tool-properties.js
@@ -32,7 +32,7 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.ToolProperties = Montage.create(Component, {
-    
+
     _visible: {
         value: false, enumerable: false
     },
-- 
cgit v1.2.3


From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:42:16 -0700
Subject: Remove trailing spaces

---
 .../binding-properties.reel/binding-properties.html                 | 4 ++--
 .../tools-properties/brush-properties.reel/brush-properties.css     | 2 +-
 .../tools-properties/eraser-properties.reel/eraser-properties.html  | 2 +-
 .../eyedropper-properties.reel/eyedropper-properties.html           | 2 +-
 .../ink-bottle-properties.reel/ink-bottle-properties.html           | 2 +-
 .../tools-properties/oval-properties.reel/oval-properties.css       | 4 ++--
 .../rotate-stage-properties.reel/rotate-stage-properties.html       | 2 +-
 .../selection-properties.reel/selection-properties.html             | 2 +-
 .../tools-properties/shape-properties.reel/shape-properties.css     | 2 +-
 .../tools-properties/shape-properties.reel/shape-properties.html    | 6 +++---
 .../tools-properties/tag-properties.reel/tag-properties.html        | 2 +-
 .../tools-properties/text-properties.reel/text-properties.html      | 4 ++--
 .../tools-properties/zoom-properties.reel/zoom-properties.html      | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'js/components/tools-properties')

diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 2269850c..a95bb52c 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.html
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
             }
         }
         </script>
-      
+
     </head>
 
     <body>
@@ -56,4 +56,4 @@ POSSIBILITY OF SUCH DAMAGE.
 
 </html>
 
-        
+
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css
index 625887d6..a129fd37 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.css
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css
@@ -27,5 +27,5 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
+
 
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index d9ebe6bc..0a500fa2 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
             }
         }
         </script>
-        
+
     </head>
 
     <body>
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index f2573df9..0cff6a02 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
             }
         }
         </script>
-       
+
     </head>
 
     <body>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index f6100282..8fafe616 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -166,7 +166,7 @@ POSSIBILITY OF SUCH DAMAGE.
             }
         }
         </script>
-        
+
     </head>
 
     <body>
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index f75355c6..a6fff483 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -33,9 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 .ovalProperties  hottextunit {
     width: 22px;
-}   
+}
 
 .ovalProperties  label {
     margin-left: 6px;
     margin-right: 6px;
-}  
+}
diff --git a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
index 08418d31..3b8efed0 100755
--- a/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
+++ b/js/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
             }
         }
         </script>
-        
+
     </head>
 
     <body>
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index 239f24b0..f3581ac8 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 "properties": {
                     "element": {"#": "selectionProperties"},
                     "transform": {"#": "transformCheck"},
-                    
+
                     "topAlign": {"#": "topAlignBtn"},
                     "middleAlign": {"#": "middleAlignBtn"},
                     "bottomAlign": {"#": "bottomAlignBtn"},
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 8660bee2..1e34bc9f 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -27,7 +27,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
+
 .optionsShapeTool select.nj-skinned {
     margin-top: 2px;
 }
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 220a91a3..c2818d9c 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -70,7 +70,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     "value": 1,
                     "decimalPlace": 10,
                     "acceptableUnits": ["px", "pt"]
-                    
+
                 }
             },
 
@@ -150,7 +150,7 @@ POSSIBILITY OF SUCH DAMAGE.
         }
         </script>
 
-     
+
     </head>
 
     <body>
@@ -182,7 +182,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
             <div data-montage-id="fillIcon" class="toolColorChipIcon FillTool"></div>
             <select class="selectBox" data-montage-id="fillMaterialCB">
-            </select>            
+            </sel