diff options
author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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": { |