diff options
author | Kruti Shah | 2012-06-27 09:25:42 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-27 09:25:42 -0700 |
commit | d6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch) | |
tree | c37300f67a3fb502d7f4e277600944739d48fd82 /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | b52747edbeba7d210fca98acccb2d2df52134bca (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
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": { |