diff options
author | John Mayhew | 2012-07-09 17:28:24 -0700 |
---|---|---|
committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/components/tools-properties/text-properties.reel | |
parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
3 files changed, 225 insertions, 368 deletions
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 60317304..fc421035 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -63,6 +64,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
63 | width: 160px; | 64 | width: 160px; |
64 | } | 65 | } |
65 | 66 | ||
67 | .optionsTextTool .montage-button:hover { | ||
68 | color:#FFF; | ||
69 | } | ||
70 | |||
66 | .fontColorChipContainer { | 71 | .fontColorChipContainer { |
67 | margin-left: 10px !important; | 72 | margin-left: 10px !important; |
68 | margin-right: 0px; | 73 | 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 6784e41c..37735032 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -35,79 +36,87 @@ POSSIBILITY OF SUCH DAMAGE. | |||
35 | 36 | ||
36 | <script type="text/montage-serialization"> | 37 | <script type="text/montage-serialization"> |
37 | { | 38 | { |
38 | |||
39 | "owner": { | 39 | "owner": { |
40 | "prototype": "js/components/tools-properties/text-properties.reel", | 40 | "prototype": "js/components/tools-properties/text-properties.reel", |
41 | "properties": { | 41 | "properties": { |
42 | "element": {"#": "textProperties"}, | 42 | "element": {"#": "textProperties"}, |
43 | "className": {"@": "className"}, | 43 | |
44 | "tagType": {"@": "tagType"}, | 44 | "fontName": {"@": "fontname"}, |
45 | "fontSelection": {"@": "fontSelection"}, | 45 | "fontSize": {"@": "fontsize"}, |
46 | "fontSettings": {"@": "fontSettings"}, | ||
47 | "fontSize": {"@": "fontSize"}, | ||
48 | "fontColor": {"#": "fontColorCtrl"}, | 46 | "fontColor": {"#": "fontColorCtrl"}, |
47 | |||
49 | "btnBold": {"@": "btnBold"}, | 48 | "btnBold": {"@": "btnBold"}, |
50 | "btnItalic": {"@": "btnItalic"}, | 49 | "btnItalic": {"@": "btnItalic"}, |
51 | "btnUnderline": {"@": "btnUnderline"}, | 50 | "btnUnderline": {"@": "btnUnderline"}, |
52 | "btnStrikethrough": {"@": "btnStrikethrough"}, | 51 | "btnStrikethrough": {"@": "btnStrikethrough"}, |
52 | |||
53 | "alignLeft": {"@": "alignLeft"}, | 53 | "alignLeft": {"@": "alignLeft"}, |
54 | "alignCenter": {"@": "alignCenter"}, | 54 | "alignCenter": {"@": "alignCenter"}, |
55 | "alignRight": {"@": "alignRight"}, | 55 | "alignRight": {"@": "alignRight"}, |
56 | "alignJustify": {"@": "alignJustify"}, | 56 | "alignJustify": {"@": "alignJustify"}, |
57 | |||
57 | "indent": {"@": "indent"}, | 58 | "indent": {"@": "indent"}, |
58 | "outdent": {"@": "outdent"}, | 59 | "outdent": {"@": "outdent"}, |
60 | |||
59 | "numberedList": {"@": "numberedList"}, | 61 | "numberedList": {"@": "numberedList"}, |
60 | "bulletedList": {"@": "bulletedList"} | 62 | "bulletedList": {"@": "bulletedList"} |
61 | } | 63 | } |
62 | }, | 64 | }, |
63 | "className": { | 65 | |
64 | "prototype": "js/components/textfield.reel[TextField]", | 66 | "fontname": { |
67 | "prototype": "montage/ui/native/select.reel", | ||
65 | "properties": { | 68 | "properties": { |
66 | "element": {"#": "className"} | 69 | "element": {"#": "fontname"}, |
70 | "preventFocus": true, | ||
71 | "contentController": {"@": "fontnameController"} | ||
67 | } | 72 | } |
68 | }, | 73 | }, |
69 | "tagType": { | 74 | |
70 | "prototype": "js/components/combobox.reel", | 75 | "fontnameController": { |
76 | "prototype": "montage/ui/controller/array-controller", | ||
71 | "properties": { | 77 | "properties": { |
72 | "element": {"#": "tagType"} | 78 | "selectObjectsOnAddition": false, |
79 | "content": [ | ||
80 | {"text" : "Arial", "value": "Arial"}, | ||
81 | {"text" : "Arial Black", "value": "Arial Black"}, | ||
82 | {"text" : "Courier New", "value": "Courier New"}, | ||
83 | {"text" : "Garamond", "value": "Garamond"}, | ||
84 | {"text" : "Georgia", "value": "Georgia"}, | ||
85 | {"text" : "Open Sans", "value": "Open Sans"}, | ||
86 | {"text" : "Tahoma", "value": "Tahoma"}, | ||
87 | {"text" : "Times New Roman", "value": "Times New Roman"}, | ||
88 | {"text" : "Times", "value": "Times"}, | ||
89 | {"text" : "Trebuchet", "value": "Trebuchet MS"}, | ||
90 | {"text" : "Verdana", "value": "Verdana"} | ||
91 | ] | ||
73 | } | 92 | } |
74 | }, |