From d7ead10b566e7de121b2cd2c99fecca8469d63b8 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 7 Feb 2012 16:30:47 -0800
Subject: Initial Text tool completion.

---
 .../text-properties.reel/text-properties.html      | 202 +++++++++++++++------
 1 file changed, 146 insertions(+), 56 deletions(-)

(limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')

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 fb57c06d..14123b12 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -33,8 +33,8 @@
                     "alignCenter": {"@": "alignCenter"},
                     "alignRight": {"@": "alignRight"},
                     "alignJustify": {"@": "alignJustify"},
-                    "indentRight": {"@": "indentRight"},
-                    "indentLeft": {"@": "indentLeft"},
+                    "indent": {"@": "indent"},
+                    "outdent": {"@": "outdent"},
                     "numberedList": {"@": "numberedList"},
                     "bulletedList": {"@": "bulletedList"}
                 }
@@ -57,8 +57,16 @@
                 "module": "js/components/combobox.reel",
                 "name": "Combobox",
                 "properties": {
-                    "element": {"#": "fontSelection"}
-                }
+                    "element": {"#": "fontSelection"},
+                    "identifier": "fontSelection"
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+
             },
             "fontSettings": {
                 "module": "js/components/button.reel",
@@ -72,48 +80,90 @@
                 "module": "js/components/hottextunit.reel",
                 "name": "HotTextUnit",
                 "properties": {
-                    "element": {"#": "fontSize"}
-                }
-            },
+                    "element": {"#": "fontSize"},
+                    "value": 12,
+                    "identifier": "fontSize"
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "changing",
+                        "listener": {"@": "owner"}
+                    }
+                ]
 
-            "fontColor": {
-                "module": "js/components/button.reel",
-                "name": "Button",
-                "properties": {
-                    "element": {"#": "fontColor"}
-                }
             },
+
+          "fontColor": {
+               "module" : "js/components/ui/color-chip.reel",
+               "name" : "ColorChip",
+               "properties" : {
+                   "element" : {"#": "fontColor"},
+                   "mode": "chip"
+               }
+           },
             "btnBold": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "btnBold"},
-                    "_isToggleButton": true
-                }
+                    "_isToggleButton": true,
+                    "identifier": "btnBold"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "btnItalic": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "btnItalic"},
-                    "_isToggleButton": true
-                }
+                    "_isToggleButton": true,
+                    "identifier": "btnItalic"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "btnUnderline": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "btnUnderline"},
-                    "_isToggleButton": true
-                }
+                    "_isToggleButton": true,
+                    "identifier": "btnUnderline"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "btnStrikethrough": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "btnStrikethrough"},
-                    "_isToggleButton": true
-                }
+                    "_isToggleButton": true,
+                    "identifier": "btnStrikethrough"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "txtLink": {
                 "module": "js/components/textfield.reel",
@@ -134,66 +184,106 @@
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "alignLeft"}
-                }
+                    "element": {"#": "alignLeft"},
+                    "_isToggleButton": true,
+                    "identifier": "alignLeft"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "alignCenter": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "alignCenter"}
-                }
+                    "element": {"#": "alignCenter"},
+                    "_isToggleButton": true,
+                    "identifier": "alignCenter"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "alignRight": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "alignRight"}
-                }
+                    "element": {"#": "alignRight"},
+                    "_isToggleButton": true,
+                    "identifier": "alignRight"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "alignJustify": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "alignJustify"}
-                }
+                    "element": {"#": "alignJustify"},
+                    "_isToggleButton": true,
+                    "identifier": "alignJustify"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
-            "indentRight": {
+            "indent": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "indentRight"}
+                    "element": {"#": "indent"}
                 }
             },
-            "indentLeft": {
+            "outdent": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "indentLeft"}
+                    "element": {"#": "outdent"}
                 }
             },
             "bulletedList": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "bulletedList"}
-                }
+                    "element": {"#": "bulletedList"},
+                    "_isToggleButton": true,
+                    "identifier": "bulletedList"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "numberedList": {
                 "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "numberedList"}
-                }
-            },
-            "fontColor": {
-               "module" : "js/components/ui/color-chip.reel",
-               "name" : "ColorChip",
-               "properties" : {
-                   "element" : {"#": "fontColor"},
-                   "mode": "chip"
-               }
-           }
+                    "element": {"#": "numberedList"},
+                    "_isToggleButton": true,
+                    "identifier": "numberedList"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            }
 
     	}
 	    </script>
@@ -202,16 +292,16 @@
 
     <body>
         <div id="textProperties" class="subToolHolderPanel optionsTextTool">
-            <label class="label">Class:</label>
-            <input id="className" />
-            <label class="label">Tag:</label>
-            <select id="tagType"></select>
+            <label class="label" style="display: none">Class:</label>
+            <input id="className" style="display: none" />
+            <label class="label" style="display: none">Tag:</label>
+            <select id="tagType" style="display: none"></select>
             <label class="label">Font:</label>
-            <select id="fontSelection"></select>
-            <button id="fontSettings"></button>
+            <select id="fontSelection" class="fontSelection"></select>
+            <button id="fontSettings" style="display: none"></button>
             <label class="label">Size:</label>
             <input id="fontSize"/>
-            <div id="fontColor" style="display:none"></div>
+            <button id="fontColor"></button>
             <button id="btnBold" class="btnBold"></button>
             <button id="btnItalic" class="btnItalic"></button>
             <button id="btnUnderline" class="btnItalic"></button>
@@ -223,10 +313,10 @@
                 <button id="alignLeft"></button>
                 <button id="alignCenter"></button>
                 <button id="alignRight"></button>
+                <button id="alignJustify" style="display: none;"></button>
             </div>
-            <button id="alignJustify"></button>
-            <button id="indentRight"></button>
-            <button id="indentLeft"></button>
+            <button id="indent"></button>
+            <button id="outdent"></button>
             <button id="bulletedList"></button>
             <button id="numberedList"></button>
         </div>
-- 
cgit v1.2.3


From ce963d45cdf2703d2d4eedfa94394b178f86e0f1 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Thu, 9 Feb 2012 17:11:38 -0800
Subject: More Text Tool Updates

---
 .../text-properties.reel/text-properties.html      | 204 +++++++++++----------
 1 file changed, 110 insertions(+), 94 deletions(-)

(limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')

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 14123b12..7ded1236 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -77,41 +77,30 @@
             },
 
             "fontSize": {
-                "module": "js/components/hottextunit.reel",
-                "name": "HotTextUnit",
+                "module": "js/components/combobox.reel",
+                "name": "Combobox",
                 "properties": {
                     "element": {"#": "fontSize"},
-                    "value": 12,
                     "identifier": "fontSize"
                 },
                 "listeners": [
                     {
                         "type": "change",
                         "listener": {"@": "owner"}
-                    },
-                    {
-                        "type": "changing",
-                        "listener": {"@": "owner"}
                     }
                 ]
 
             },
-
-          "fontColor": {
-               "module" : "js/components/ui/color-chip.reel",
-               "name" : "ColorChip",
-               "properties" : {
-                   "element" : {"#": "fontColor"},
-                   "mode": "chip"
-               }
-           },
+        
             "btnBold": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnBold"},
-                    "_isToggleButton": true,
-                    "identifier": "btnBold"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnBold",
+                    "label": "B"
                 },
                 "listeners": [
                     {
@@ -121,12 +110,14 @@
                 ]
             },
             "btnItalic": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnItalic"},
-                    "_isToggleButton": true,
-                    "identifier": "btnItalic"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnItalic",
+                    "label": "I"
                 },
                 "listeners": [
                     {
@@ -136,12 +127,14 @@
                 ]
             },
             "btnUnderline": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnUnderline"},
-                    "_isToggleButton": true,
-                    "identifier": "btnUnderline"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnUnderline",
+                    "label": "U"
                 },
                 "listeners": [
                     {
@@ -151,12 +144,14 @@
                 ]
             },
             "btnStrikethrough": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "btnStrikethrough"},
-                    "_isToggleButton": true,
-                    "identifier": "btnStrikethrough"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "btnStrikethrough",
+                    "label": "S"
                 },
                 "listeners": [
                     {
@@ -165,28 +160,16 @@
                     }
                 ]
             },
-            "txtLink": {
-                "module": "js/components/textfield.reel",
-                "name": "TextField",
-                "properties": {
-                    "element": {"#": "txtLink"}
-                }
-            },
-            "linkTarget": {
-                "module": "js/components/combobox.reel",
-                "name": "Combobox",
-                "properties": {
-                    "element": {"#": "linkTarget"}
-                }
-            },
-
+            
             "alignLeft": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "alignLeft"},
-                    "_isToggleButton": true,
-                    "identifier": "alignLeft"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "alignLeft",
+                    "label": "Left"
                 },
                 "listeners": [
                     {
@@ -196,12 +179,14 @@
                 ]
             },
             "alignCenter": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "alignCenter"},
-                    "_isToggleButton": true,
-                    "identifier": "alignCenter"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "alignCenter",
+                    "label": "Center"
                 },
                 "listeners": [
                     {
@@ -211,12 +196,14 @@
                 ]
             },
             "alignRight": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "alignRight"},
-                    "_isToggleButton": true,
-                    "identifier": "alignRight"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "alignRight",
+                    "label": "Right"
                 },
                 "listeners": [
                     {
@@ -226,12 +213,14 @@
                 ]
             },
             "alignJustify": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "alignJustify"},
-                    "_isToggleButton": true,
-                    "identifier": "alignJustify"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "alignJustify",
+                    "label": "Justify"
                 },
                 "listeners": [
                     {
@@ -241,26 +230,48 @@
                 ]
             },
             "indent": {
-                "module": "js/components/button.reel",
+                "module": "montage/ui/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "indent"}
-                }
+                    "element": {"#": "indent"},
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "outdent",
+                    "label": ">>"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "outdent": {
-                "module": "js/components/button.reel",
+                "module": "montage/ui/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "outdent"}
-                }
+                    "element": {"#": "outdent"},
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "<<",
+                    "label": "<<"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
             "bulletedList": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "bulletedList"},
-                    "_isToggleButton": true,
-                    "identifier": "bulletedList"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "bulletedList",
+                    "label": "• • •"
                 },
                 "listeners": [
                     {
@@ -270,12 +281,14 @@
                 ]
             },
             "numberedList": {
-                "module": "js/components/button.reel",
-                "name": "Button",
+                "module": "montage/ui/toggle-button.reel",
+                "name": "ToggleButton",
                 "properties": {
                     "element": {"#": "numberedList"},
-                    "_isToggleButton": true,
-                    "identifier": "numberedList"
+                    "pressedClass": "active",
+                    "preventFocus": true,
+                    "identifier": "numberedList",
+                    "label": "1 2 3"
                 },
                 "listeners": [
                     {
@@ -301,24 +314,27 @@
             <button id="fontSettings" style="display: none"></button>
             <label class="label">Size:</label>
             <input id="fontSize"/>
-            <button id="fontColor"></button>
-            <button id="btnBold" class="btnBold"></button>
-            <button id="btnItalic" class="btnItalic"></button>
-            <button id="btnUnderline" class="btnItalic"></button>
-            <button id="btnStrikethrough" class="btnStriketrough"></button>
-            <label class="label">Link:</label>
-            <input id="txtLink" />
-            <select id="linkTarget"></select>
-            <div id="btnsAlign">
-                <button id="alignLeft"></button>
-                <button id="alignCenter"></button>
-                <button id="alignRight"></button>
-                <button id="alignJustify" style="display: none;"></button>
+            <div class="fontColor"></div>
+            <div class="btnGroup">
+                <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button>
+                <button id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button>
+                <button id="btnUnderline" class="btnUnderline nj-skinned" style="text-decoration: underline;"></button>
+                <button id="btnStrikethrough" class="btnStriketrough nj-skinned" style="text-decoration: line-through;"></button>
+            </div>
+            <div class="btnGroup">
+                <button id="alignLeft" class="nj-skinned"></button>
+                <button id="alignCenter" class="nj-skinned"></button>
+                <button id="alignRight" class="nj-skinned"></button>
+                <button id="alignJustify" class="nj-skinned"></button>
+            </div>
+            <div class="btnGroup">
+                <button id="indent" class="nj-skinned"></button>
+                <button id="outdent" class="nj-skinned"></button>
+            </div>
+            <div class="btnGroup">
+                <button id="bulletedList" class="nj-skinned"></button>
+                <button id="numberedList" class="nj-skinned"></button>
             </div>
-            <button id="indent"></button>
-            <button id="outdent"></button>
-            <button id="bulletedList"></button>
-            <button id="numberedList"></button>
         </div>
     </body>
 
-- 
cgit v1.2.3