diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/layout/tools-list.reel/tools-list.html | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 9aa05e5d..df603bf8 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -16,11 +16,7 @@ | |||
16 | "element": {"#": "toolbutton"} | 16 | "element": {"#": "toolbutton"} |
17 | }, | 17 | }, |
18 | "bindings": { | 18 | "bindings": { |
19 | "data": { | 19 | "data": {"<-": "@repetition1.objectAtCurrentIteration"} |
20 | "boundObject": {"@": "repetition1"}, | ||
21 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
22 | "oneway": true | ||
23 | } | ||
24 | } | 20 | } |
25 | }, | 21 | }, |
26 | 22 | ||
@@ -30,11 +26,7 @@ | |||
30 | "element": {"#": "groupLine"} | 26 | "element": {"#": "groupLine"} |
31 | }, | 27 | }, |
32 | "bindings": { | 28 | "bindings": { |
33 | "condition": { | 29 | "condition": {"<-": "@repetition1.objectAtCurrentIteration.lastInGroup"} |
34 | "boundObject": {"@": "repetition1"}, | ||
35 | "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup", | ||
36 | "oneway": true | ||
37 | } | ||
38 | } | 30 | } |
39 | }, | 31 | }, |
40 | 32 | ||
@@ -55,9 +47,6 @@ | |||
55 | "SelectionTool1": { | 47 | "SelectionTool1": { |
56 | "prototype": "js/tools/SelectionTool" | 48 | "prototype": "js/tools/SelectionTool" |
57 | }, | 49 | }, |
58 | "SubselectionTool1": { | ||
59 | "prototype": "js/tools/SubSelectTool" | ||
60 | }, | ||
61 | "Rotate3DTool1": { | 50 | "Rotate3DTool1": { |
62 | "prototype": "js/tools/RotateObject3DTool" | 51 | "prototype": "js/tools/RotateObject3DTool" |
63 | }, | 52 | }, |
@@ -85,9 +74,6 @@ | |||
85 | "LineTool1": { | 74 | "LineTool1": { |
86 | "prototype": "js/tools/LineTool" | 75 | "prototype": "js/tools/LineTool" |
87 | }, | 76 | }, |
88 | "PencilTool1": { | ||
89 | "prototype": "js/tools/PencilTool" | ||
90 | }, | ||
91 | "BrushTool1": { | 77 | "BrushTool1": { |
92 | "prototype": "js/tools/BrushTool" | 78 | "prototype": "js/tools/BrushTool" |
93 | }, | 79 | }, |
@@ -97,9 +83,6 @@ | |||
97 | "InkBottleTool1": { | 83 | "InkBottleTool1": { |
98 | "prototype": "js/tools/InkBottleTool" | 84 | "prototype": "js/tools/InkBottleTool" |
99 | }, | 85 | }, |
100 | "EyedropperTool1": { | ||
101 | "prototype": "js/tools/EyedropperTool" | ||
102 | }, | ||
103 | "EraserTool1": { | 86 | "EraserTool1": { |
104 | "prototype": "js/tools/EraserTool" | 87 | "prototype": "js/tools/EraserTool" |
105 | }, | 88 | }, |
@@ -132,7 +115,6 @@ | |||
132 | "properties": { | 115 | "properties": { |
133 | "element": {"#": "toolsList"}, | 116 | "element": {"#": "toolsList"}, |
134 | "SelectionTool": {"@": "SelectionTool1"}, | 117 | "SelectionTool": {"@": "SelectionTool1"}, |
135 | "SubselectionTool": {"@": "SubselectionTool1"}, | ||
136 | "Rotate3DTool": {"@": "Rotate3DTool1"}, | 118 | "Rotate3DTool": {"@": "Rotate3DTool1"}, |
137 | "Translate3DTool": {"@": "Translate3DTool1"}, | 119 | "Translate3DTool": {"@": "Translate3DTool1"}, |
138 | "TagTool": {"@": "TagTool1"}, | 120 | "TagTool": {"@": "TagTool1"}, |
@@ -142,11 +124,9 @@ | |||
142 | "OvalTool": {"@": "OvalTool1"}, | 124 | "OvalTool": {"@": "OvalTool1"}, |
143 | "RectTool": {"@": "RectTool1"}, | 125 | "RectTool": {"@": "RectTool1"}, |
144 | "LineTool": {"@": "LineTool1"}, | 126 | "LineTool": {"@": "LineTool1"}, |
145 | "PencilTool": {"@": "PencilTool1"}, | ||
146 | "BrushTool": {"@": "BrushTool1"}, | 127 | "BrushTool": {"@": "BrushTool1"}, |
147 | "FillTool": {"@": "FillTool1"}, | 128 | "FillTool": {"@": "FillTool1"}, |
148 | "InkBottleTool": {"@": "InkBottleTool1"}, | 129 | "InkBottleTool": {"@": "InkBottleTool1"}, |
149 | "EyedropperTool": {"@": "EyedropperTool1"}, | ||
150 | "EraserTool": {"@": "EraserTool1"}, | 130 | "EraserTool": {"@": "EraserTool1"}, |
151 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 131 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
152 | "PanTool": {"@": "PanTool1"}, | 132 | "PanTool": {"@": "PanTool1"}, |
@@ -169,8 +149,6 @@ | |||
169 | <hr /> | 149 | <hr /> |
170 | </div> | 150 | </div> |
171 | </div> | 151 | </div> |
172 | <!-- TODO: Remove and add as a component --> | ||
173 | <div id="colortoolbar"></div> | ||
174 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> | 152 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
175 | </div> | 153 | </div> |
176 | 154 | ||