diff options
Diffstat (limited to 'js')
5 files changed, 244 insertions, 154 deletions
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js index ce5ac1af..2d26c8b4 100644 --- a/js/components/button.reel/button.js +++ b/js/components/button.reel/button.js | |||
@@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, { | |||
179 | value: function() { | 179 | value: function() { |
180 | if(this.isToggleButton) | 180 | if(this.isToggleButton) |
181 | { | 181 | { |
182 | if(this._value) | 182 | if(this._value === true) |
183 | { | 183 | { |
184 | this.element.classList.remove(this.offState); | 184 | this.element.classList.remove(this.offState); |
185 | this.element.classList.add(this.onState); | 185 | this.element.classList.add(this.onState); |
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 2eb608d3..6aa61812 100644 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css | |||
@@ -5,31 +5,33 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .optionsTextTool { | 7 | .optionsTextTool { |
8 | display: -webkit-box; | 8 | padding: 6px; |
9 | -webkit-box-orient:horizontal; | ||
10 | -webkit-box-align: stretch; | ||
11 | padding: 5px; | ||
12 | } | 9 | } |
13 | 10 | ||
14 | 11 | .optionsTextTool .btnGroup { | |
15 | .optionsTextTool > * { | 12 | padding: 0px 8px; |
16 | -webkit-box-flex:0; | ||
17 | } | 13 | } |
18 | 14 | ||
19 | .optionsTextTool .button { | 15 | .optionsTextTool > *, .optionsTextTool .btnGroup > * { |
20 | width: auto; | 16 | float:left; |
21 | |||
22 | } | 17 | } |
23 | 18 | ||
24 | .optionsTextTool .hottextunit { | 19 | .optionsTextTool button { |
25 | padding-top:5px; | 20 | width: auto; |
21 | padding: 4px 8px !important; | ||
22 | margin-left:4px; | ||
26 | } | 23 | } |
27 | 24 | ||
28 | .optionsTextTool .label, .optionsTextTool .hottextunit { | 25 | .optionsTextTool .label, .optionsTextTool .hottextunit { |
29 | float:none; | ||
30 | font-size:11px; | 26 | font-size:11px; |
31 | } | 27 | } |
32 | 28 | ||
33 | .optionsTextTool .fontSelection { | 29 | .optionsTextTool .fontSelection { |
34 | width:100px; | 30 | width:100px; |
31 | } | ||
32 | |||
33 | .optionsTextTool .fontColor { | ||
34 | width: 20px; | ||
35 | height: 18px; | ||
36 | margin: 2px 6px; | ||
35 | } \ No newline at end of file | 37 | } \ No newline at end of file |
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 @@ | |||
77 | }, | 77 | }, |
78 | 78 | ||
79 | "fontSize": { | 79 | "fontSize": { |
80 | "module": "js/components/hottextunit.reel", | 80 | "module": "js/components/combobox.reel", |
81 | "name": "HotTextUnit", | 81 | "name": "Combobox", |
82 | "properties": { | 82 | "properties": { |
83 | "element": {"#": "fontSize"}, | 83 | "element": {"#": "fontSize"}, |
84 | "value": 12, | ||
85 | "identifier": "fontSize" | 84 | "identifier": "fontSize" |
86 | }, | 85 | }, |
87 | "listeners": [ | 86 | "listeners": [ |
88 | { | 87 | { |
89 | "type": "change", | 88 | "type": "change", |
90 | "listener": {"@": "owner"} | 89 | "listener": {"@": "owner"} |
91 | }, | ||
92 | { | ||
93 | "type": "changing", | ||
94 | "listener": {"@": "owner"} | ||
95 | } | 90 | } |
96 | ] | 91 | ] |
97 | 92 | ||
98 | }, | 93 | }, |
99 | 94 | ||
100 | "fontColor": { | ||
101 | "module" : "js/components/ui/color-chip.reel", | ||
102 | "name" : "ColorChip", | ||
103 | "properties" : { | ||
104 | "element" : {"#": "fontColor"}, | ||
105 | "mode": "chip" | ||
106 | } | ||
107 | }, | ||
108 | "btnBold": { | 95 | "btnBold": { |
109 | "module": "js/components/button.reel", | 96 | "module": "montage/ui/toggle-button.reel", |
110 | "name": "Button", | 97 | "name": "ToggleButton", |
111 | "properties": { | 98 | "properties": { |
112 | "element": {"#": "btnBold"}, | 99 | "element": {"#": "btnBold"}, |
113 | "_isToggleButton": true, | 100 | "pressedClass": "active", |
114 | "identifier": "btnBold" | 101 | "preventFocus": true, |
102 | "identifier": "btnBold", | ||
103 | "label": "B" | ||
115 | }, | 104 | }, |
116 | "listeners": [ | 105 | "listeners": [ |
117 | { | 106 | { |
@@ -121,12 +110,14 @@ | |||
121 | ] | 110 | ] |
122 | }, | 111 | }, |
123 | "btnItalic": { | 112 | "btnItalic": { |
124 | "module": "js/components/button.reel", | 113 | "module": "montage/ui/toggle-button.reel", |
125 | "name": "Button", | 114 | "name": "ToggleButton", |
126 | "properties": { | 115 | "properties": { |
127 | "element": {"#": "btnItalic"}, | 116 | "element": {"#": "btnItalic"}, |
128 | "_isToggleButton": true, | 117 | "pressedClass": "active", |
129 | "identifier": "btnItalic" | 118 | "preventFocus": true, |
119 | "identifier": "btnItalic", | ||
120 | "label": "I" | ||
130 | }, | 121 | }, |
131 | "listeners": [ | 122 | "listeners": [ |
132 | { | 123 | { |
@@ -136,12 +127,14 @@ | |||
136 | ] | 127 | ] |
137 | }, | 128 | }, |
138 | "btnUnderline": { | 129 | "btnUnderline": { |
139 | "module": "js/components/button.reel", | 130 | "module": "montage/ui/toggle-button.reel", |
140 | "name": "Button", | 131 | "name": "ToggleButton", |
141 | "properties": { | 132 | "properties": { |
142 | "element": {"#": "btnUnderline"}, | 133 | "element": {"#": "btnUnderline"}, |
143 | "_isToggleButton": true, | 134 | "pressedClass": "active", |
144 | "identifier": "btnUnderline" | 135 | "preventFocus": true, |
136 | "identifier": "btnUnderline", | ||
137 | "label": "U" | ||
145 | }, | 138 | }, |
146 | "listeners": [ | 139 | "listeners": [ |
147 | { | 140 | { |
@@ -151,12 +144,14 @@ | |||
151 | ] | 144 | ] |
152 | }, | 145 | }, |
153 | "btnStrikethrough": { | 146 | "btnStrikethrough": { |
154 | "module": "js/components/button.reel", | 147 | "module": "montage/ui/toggle-button.reel", |
155 | "name": "Button", | 148 | "name": "ToggleButton", |
156 | "properties": { | 149 | "properties": { |
157 | "element": {"#": "btnStrikethrough"}, | 150 | "element": {"#": "btnStrikethrough"}, |
158 | "_isToggleButton": true, | 151 | "pressedClass": "active", |
159 | "identifier": "btnStrikethrough" | 152 | "preventFocus": true, |
153 | "identifier": "btnStrikethrough", | ||
154 | "label": "S" | ||
160 | }, | 155 | }, |
161 | "listeners": [ | 156 | "listeners": [ |
162 | { | 157 | { |
@@ -165,28 +160,16 @@ | |||
165 | } | 160 | } |
166 | ] | 161 | ] |
167 | }, | 162 | }, |