aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/components/layout/tools-list.reel
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/components/layout/tools-list.reel')
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.html19
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.js0
3 files changed, 18 insertions, 1 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.css b/js/components/layout/tools-list.reel/tools-list.css
index c58397e2..c58397e2 100644..100755
--- a/js/components/layout/tools-list.reel/tools-list.css
+++ b/js/components/layout/tools-list.reel/tools-list.css
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 100644..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
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index e26ab391..e26ab391 100644..100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js