aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 13:40:44 -0700
committerJose Antonio Marquez2012-06-26 13:40:44 -0700
commit81747f839bf5d176a15511303f7d2a0e4028e5bb (patch)
tree5afab7fb834f9df27d2bf35f6414a906c27ec598 /js/components/tools-properties/text-properties.reel/text-properties.html
parent9ebf80d943b894242d90cf62bc3078c6a83041ad (diff)
parent87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff)
downloadninja-81747f839bf5d176a15511303f7d2a0e4028e5bb.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html9
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": {