diff options
author | Nivesh Rajbhandari | 2012-02-22 16:45:08 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 16:45:08 -0800 |
commit | 1ed02c161f0fc063299a606e61ccece878a307a3 (patch) | |
tree | d28b88a62125446644a220ef706cabcb46dc15e7 /js/components/layout/tools-list.reel/tools-list.html | |
parent | 5272d5585b0fbae233d829ac9a9b5207838ec74c (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-1ed02c161f0fc063299a606e61ccece878a307a3.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index e12fd59b..2c5617e5 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -25,6 +25,21 @@ | |||
25 | } | 25 | } |
26 | }, | 26 | }, |
27 | 27 | ||
28 | "groupLine": { | ||
29 | "module": "montage/ui/condition.reel", | ||
30 | "name": "Condition", | ||
31 | "properties": { | ||
32 | "element": {"#": "groupLine"} | ||
33 | }, | ||
34 | "bindings": { | ||
35 | "condition": { | ||
36 | "boundObject": {"@": "repetition1"}, | ||
37 | "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup", | ||
38 | "oneway": true | ||
39 | } | ||
40 | } | ||
41 | }, | ||
42 | |||
28 | "repetition1": { | 43 | "repetition1": { |
29 | "module": "montage/ui/repetition.reel", | 44 | "module": "montage/ui/repetition.reel", |
30 | "name": "Repetition", | 45 | "name": "Repetition", |
@@ -163,9 +178,11 @@ | |||
163 | <div id="toolsList" class="toolsList"> | 178 | <div id="toolsList" class="toolsList"> |
164 | <div id="toolscontainer" class="toolscontainer"> | 179 | <div id="toolscontainer" class="toolscontainer"> |
165 | <div id="toolbutton" class="toolbutton"></div> | 180 | <div id="toolbutton" class="toolbutton"></div> |
181 | <div id="groupLine"> | ||
182 | <hr /> | ||
183 | </div> | ||
166 | </div> | 184 | </div> |
167 | <!-- TODO: Remove and add as a component --> | 185 | <!-- TODO: Remove and add as a component --> |
168 | <hr class="toolbar_hr" /> | ||
169 | <div id="colortoolbar"></div> | 186 | <div id="colortoolbar"></div> |
170 | </div> | 187 | </div> |
171 | 188 | ||