diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/components/layout/tools-list.reel/tools-list.html | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index acee20b2..d5c33624 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -55,9 +55,6 @@ | |||
| 55 | "SelectionTool1": { | 55 | "SelectionTool1": { |
| 56 | "prototype": "js/tools/SelectionTool" | 56 | "prototype": "js/tools/SelectionTool" |
| 57 | }, | 57 | }, |
| 58 | "SubselectionTool1": { | ||
| 59 | "prototype": "js/tools/SubSelectTool" | ||
| 60 | }, | ||
| 61 | "Rotate3DTool1": { | 58 | "Rotate3DTool1": { |
| 62 | "prototype": "js/tools/RotateObject3DTool" | 59 | "prototype": "js/tools/RotateObject3DTool" |
| 63 | }, | 60 | }, |
| @@ -85,9 +82,6 @@ | |||
| 85 | "LineTool1": { | 82 | "LineTool1": { |
| 86 | "prototype": "js/tools/LineTool" | 83 | "prototype": "js/tools/LineTool" |
| 87 | }, | 84 | }, |
| 88 | "PencilTool1": { | ||
| 89 | "prototype": "js/tools/PencilTool" | ||
| 90 | }, | ||
| 91 | "BrushTool1": { | 85 | "BrushTool1": { |
| 92 | "prototype": "js/tools/BrushTool" | 86 | "prototype": "js/tools/BrushTool" |
| 93 | }, | 87 | }, |
| @@ -97,9 +91,6 @@ | |||
| 97 | "InkBottleTool1": { | 91 | "InkBottleTool1": { |
| 98 | "prototype": "js/tools/InkBottleTool" | 92 | "prototype": "js/tools/InkBottleTool" |
| 99 | }, | 93 | }, |
| 100 | "EyedropperTool1": { | ||
| 101 | "prototype": "js/tools/EyedropperTool" | ||
| 102 | }, | ||
| 103 | "EraserTool1": { | 94 | "EraserTool1": { |
| 104 | "prototype": "js/tools/EraserTool" | 95 | "prototype": "js/tools/EraserTool" |
| 105 | }, | 96 | }, |
| @@ -132,7 +123,6 @@ | |||
| 132 | "properties": { | 123 | "properties": { |
| 133 | "element": {"#": "toolsList"}, | 124 | "element": {"#": "toolsList"}, |
| 134 | "SelectionTool": {"@": "SelectionTool1"}, | 125 | "SelectionTool": {"@": "SelectionTool1"}, |
| 135 | "SubselectionTool": {"@": "SubselectionTool1"}, | ||
| 136 | "Rotate3DTool": {"@": "Rotate3DTool1"}, | 126 | "Rotate3DTool": {"@": "Rotate3DTool1"}, |
| 137 | "Translate3DTool": {"@": "Translate3DTool1"}, | 127 | "Translate3DTool": {"@": "Translate3DTool1"}, |
| 138 | "TagTool": {"@": "TagTool1"}, | 128 | "TagTool": {"@": "TagTool1"}, |
| @@ -142,11 +132,9 @@ | |||
| 142 | "OvalTool": {"@": "OvalTool1"}, | 132 | "OvalTool": {"@": "OvalTool1"}, |
| 143 | "RectTool": {"@": "RectTool1"}, | 133 | "RectTool": {"@": "RectTool1"}, |
| 144 | "LineTool": {"@": "LineTool1"}, | 134 | "LineTool": {"@": "LineTool1"}, |
| 145 | "PencilTool": {"@": "PencilTool1"}, | ||
| 146 | "BrushTool": {"@": "BrushTool1"}, | 135 | "BrushTool": {"@": "BrushTool1"}, |
| 147 | "FillTool": {"@": "FillTool1"}, | 136 | "FillTool": {"@": "FillTool1"}, |
| 148 | "InkBottleTool": {"@": "InkBottleTool1"}, | 137 | "InkBottleTool": {"@": "InkBottleTool1"}, |
| 149 | "EyedropperTool": {"@": "EyedropperTool1"}, | ||
| 150 | "EraserTool": {"@": "EraserTool1"}, | 138 | "EraserTool": {"@": "EraserTool1"}, |
| 151 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 139 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
| 152 | "PanTool": {"@": "PanTool1"}, | 140 | "PanTool": {"@": "PanTool1"}, |
| @@ -162,16 +150,14 @@ | |||
| 162 | </head> | 150 | </head> |
| 163 | 151 | ||
| 164 | <body> | 152 | <body> |
| 165 | <div id="toolsList" class="toolsList"> | 153 | <div data-montage-id="toolsList" class="toolsList"> |
| 166 | <div id="toolscontainer" class="toolscontainer"> | 154 | <div data-montage-id="toolscontainer" class="toolscontainer"> |
| 167 | <div id="toolbutton" class="toolbutton"></div> | 155 | <div data-montage-id="toolbutton" class="toolbutton"></div> |
| 168 | <div id="groupLine"> | 156 | <div data-montage-id="groupLine"> |
| 169 | <hr /> | 157 | <hr /> |
| 170 | </div> | 158 | </div> |
| 171 | </div> | 159 | </div> |
| 172 | <!-- TODO: Remove and add as a component --> | 160 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 173 | <div id="colortoolbar"></div> | ||
| 174 | <div id="disabledCondition" class="panelDisabled"></div> | ||
| 175 | </div> | 161 | </div> |
| 176 | 162 | ||
| 177 | </body> | 163 | </body> |