diff options
author | Jon Reid | 2012-06-26 14:58:10 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 9 |
1 files changed, 2 insertions, 7 deletions
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 f47ca0c8..8899ff3c 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -92,14 +92,9 @@ | |||
92 | "identifier": "btnBold", | 92 | "identifier": "btnBold", |
93 | "pressedLabel": "B", | 93 | "pressedLabel": "B", |
94 | "unpressedLabel": "B" | 94 | "unpressedLabel": "B" |
95 | }, | 95 | } |
96 | "listeners": [ | ||
97 | { | ||
98 | "type": "action", | ||
99 | "listener": {"@": "owner"} | ||
100 | } | ||
101 | ] | ||
102 | }, | 96 | }, |
97 | |||
103 | "btnItalic": { | 98 | "btnItalic": { |
104 | "prototype": "montage/ui/toggle-button.reel", | 99 | "prototype": "montage/ui/toggle-button.reel", |
105 | "properties": { | 100 | "properties": { |