diff options
author | Armen Kesablyan | 2012-06-02 20:57:00 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-02 20:57:00 -0700 |
commit | 2136cbf21beeaf7550a0a8d94c1fc246c3dcefb2 (patch) | |
tree | c475bf0f30d334584ffb617175c2e027438f058e /js/panels/binding/binding-item.reel/binding-item.html | |
parent | 7655e32da5bcdf7b205afc1908c9b7bcc661b0d4 (diff) | |
parent | 6ac505c3fc2b4be7628b9df339ab9f64de700c8b (diff) | |
download | ninja-2136cbf21beeaf7550a0a8d94c1fc246c3dcefb2.tar.gz |
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Conflicts:
js/tools/bindingTool.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/binding/binding-item.reel/binding-item.html')
-rw-r--r-- | js/panels/binding/binding-item.reel/binding-item.html | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/js/panels/binding/binding-item.reel/binding-item.html b/js/panels/binding/binding-item.reel/binding-item.html index a569b8b4..79644a7a 100644 --- a/js/panels/binding/binding-item.reel/binding-item.html +++ b/js/panels/binding/binding-item.reel/binding-item.html | |||
@@ -13,7 +13,8 @@ | |||
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "js/panels/binding/binding-item.reel", | 14 | "prototype": "js/panels/binding/binding-item.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "binding-item"} | 16 | "element": {"#": "binding-item"}, |
17 | "directionToggleButton": {"@": "directionToggleButton" } | ||
17 | } | 18 | } |
18 | }, | 19 | }, |
19 | "soProperty": { | 20 | "soProperty": { |
@@ -64,6 +65,19 @@ | |||
64 | "listener": {"@": "owner"} | 65 | "listener": {"@": "owner"} |
65 | }] | 66 | }] |
66 | 67 | ||
68 | }, | ||
69 | "directionToggleButton": { | ||
70 | "prototype": "montage/ui/button.reel", | ||
71 | "properties": { | ||
72 | "element": {"#": "direction-toggle-button"}, | ||
73 | "identifier": "directionToggleButton", | ||
74 | "label": " " | ||
75 | }, | ||
76 | "listeners": [{ | ||
77 | "type": "action", | ||
78 | "listener": {"@": "owner"} | ||
79 | }] | ||
80 | |||
67 | } | 81 | } |
68 | 82 | ||
69 | } | 83 | } |
@@ -75,6 +89,7 @@ | |||
75 | <span data-montage-id="so-property" class="so-property"></span> | 89 | <span data-montage-id="so-property" class="so-property"></span> |
76 | <span data-montage-id="so-object" class="so-object-identifier"></span> | 90 | <span data-montage-id="so-object" class="so-object-identifier"></span> |
77 | </div> | 91 | </div> |
92 | <button data-montage-id="direction-toggle-button" class="direction-toggle-button"></button> | ||
78 | <div data-montage-id="boundObject" class="bound-object"> | 93 | <div data-montage-id="boundObject" class="bound-object"> |
79 | <span data-montage-id="bo-property" class="bo-property"></span> | 94 | <span data-montage-id="bo-property" class="bo-property"></span> |
80 | <span data-montage-id="bo-object" class="bo-object-identifier"></span> | 95 | <span data-montage-id="bo-object" class="bo-object-identifier"></span> |