diff options
author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 725e1d22..a3477e99 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -93,14 +93,9 @@ | |||
93 | "identifier": "btnBold", | 93 | "identifier": "btnBold", |
94 | "pressedLabel": "B", | 94 | "pressedLabel": "B", |
95 | "unpressedLabel": "B" | 95 | "unpressedLabel": "B" |
96 | }, | 96 | } |
97 | "listeners": [ | ||
98 | { | ||
99 | "type": "action", | ||
100 | "listener": {"@": "owner"} | ||
101 | } | ||
102 | ] | ||
103 | }, | 97 | }, |
98 | |||
104 | "btnItalic": { | 99 | "btnItalic": { |
105 | "prototype": "montage/ui/toggle-button.reel", | 100 | "prototype": "montage/ui/toggle-button.reel", |
106 | "properties": { | 101 | "properties": { |