From f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:05:27 -0800
Subject: Revert "Merge from /joseeight/ninja-internal/tree/FileIO"

This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../text-properties.reel/text-properties.html      | 326 +++++++--------------
 1 file changed, 110 insertions(+), 216 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 7ded1236..fb57c06d 100755
--- 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"},
-                    "indent": {"@": "indent"},
-                    "outdent": {"@": "outdent"},
+                    "indentRight": {"@": "indentRight"},
+                    "indentLeft": {"@": "indentLeft"},
                     "numberedList": {"@": "numberedList"},
                     "bulletedList": {"@": "bulletedList"}
                 }
@@ -57,16 +57,8 @@
                 "module": "js/components/combobox.reel",
                 "name": "Combobox",
                 "properties": {
-                    "element": {"#": "fontSelection"},
-                    "identifier": "fontSelection"
-                },
-                "listeners": [
-                    {
-                        "type": "change",
-                        "listener": {"@": "owner"}
-                    }
-                ]
-
+                    "element": {"#": "fontSelection"}
+                }
             },
             "fontSettings": {
                 "module": "js/components/button.reel",
@@ -77,226 +69,131 @@
             },
 
             "fontSize": {
-                "module": "js/components/combobox.reel",
-                "name": "Combobox",
+                "module": "js/components/hottextunit.reel",
+                "name": "HotTextUnit",
                 "properties": {
-                    "element": {"#": "fontSize"},
-                    "identifier": "fontSize"
-                },
-                "listeners": [
-                    {
-                        "type": "change",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "fontSize"}
+                }
+            },
 
+            "fontColor": {
+                "module": "js/components/button.reel",
+                "name": "Button",
+                "properties": {
+                    "element": {"#": "fontColor"}
+                }
             },
-        
             "btnBold": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
                     "element": {"#": "btnBold"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "btnBold",
-                    "label": "B"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "_isToggleButton": true
+                }
             },
             "btnItalic": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
                     "element": {"#": "btnItalic"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "btnItalic",
-                    "label": "I"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "_isToggleButton": true
+                }
             },
             "btnUnderline": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
                     "element": {"#": "btnUnderline"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "btnUnderline",
-                    "label": "U"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "_isToggleButton": true
+                }
             },
             "btnStrikethrough": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
                     "element": {"#": "btnStrikethrough"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "btnStrikethrough",
-                    "label": "S"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "_isToggleButton": true
+                }
             },
-            
+            "txtLink": {
+                "module": "js/components/textfield.reel",
+                "name": "TextField",
+                "properties": {
+                    "element": {"#": "txtLink"}
+                }
+            },
+            "linkTarget": {
+                "module": "js/components/combobox.reel",
+                "name": "Combobox",
+                "properties": {
+                    "element": {"#": "linkTarget"}
+                }
+            },
+
             "alignLeft": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "alignLeft"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "alignLeft",
-                    "label": "Left"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "alignLeft"}
+                }
             },
             "alignCenter": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "alignCenter"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "alignCenter",
-                    "label": "Center"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "alignCenter"}
+                }
             },
             "alignRight": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "alignRight"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "alignRight",
-                    "label": "Right"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "alignRight"}
+                }
             },
             "alignJustify": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "alignJustify"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "alignJustify",
-                    "label": "Justify"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "alignJustify"}
+                }
             },
-            "indent": {
-                "module": "montage/ui/button.reel",
+            "indentRight": {
+                "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "indent"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "outdent",
-                    "label": ">>"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "indentRight"}
+                }
             },
-            "outdent": {
-                "module": "montage/ui/button.reel",
+            "indentLeft": {
+                "module": "js/components/button.reel",
                 "name": "Button",
                 "properties": {
-                    "element": {"#": "outdent"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "<<",
-                    "label": "<<"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "indentLeft"}
+                }
             },
             "bulletedList": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "bulletedList"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "bulletedList",
-                    "label": "• • •"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
+                    "element": {"#": "bulletedList"}
+                }
             },
             "numberedList": {
-                "module": "montage/ui/toggle-button.reel",
-                "name": "ToggleButton",
+                "module": "js/components/button.reel",
+                "name": "Button",
                 "properties": {
-                    "element": {"#": "numberedList"},
-                    "pressedClass": "active",
-                    "preventFocus": true,
-                    "identifier": "numberedList",
-                    "label": "1 2 3"
-                },
-                "listeners": [
-                    {
-                        "type": "action",
-                        "listener": {"@": "owner"}
-                    }
-                ]
-            }
+                    "element": {"#": "numberedList"}
+                }
+            },
+            "fontColor": {
+               "module" : "js/components/ui/color-chip.reel",
+               "name" : "ColorChip",
+               "properties" : {
+                   "element" : {"#": "fontColor"},
+                   "mode": "chip"
+               }
+           }
 
     	}
 	    </script>
@@ -305,36 +202,33 @@
 
     <body>
         <div id="textProperties" class="subToolHolderPanel optionsTextTool">
-            <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">Class:</label>
+            <input id="className" />
+            <label class="label">Tag:</label>
+            <select id="tagType"></select>
             <label class="label">Font:</label>
-            <select id="fontSelection" class="fontSelection"></select>
-            <button id="fontSettings" style="display: none"></button>
+            <select id="fontSelection"></select>
+            <button id="fontSettings"></button>
             <label class="label">Size:</label>
             <input id="fontSize"/>
-            <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 id="fontColor" style="display:none"></div>
+            <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>
             </div>
+            <button id="alignJustify"></button>
+            <button id="indentRight"></button>
+            <button id="indentLeft"></button>
+            <button id="bulletedList"></button>
+            <button id="numberedList"></button>
         </div>
     </body>
 
-- 
cgit v1.2.3