diff options
author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/components/layout/tools-properties.reel | |
parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/components/layout/tools-properties.reel')
-rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 10309ec4..e7d1ac8b 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -18,12 +18,6 @@ | |||
18 | "element": {"#": "selectionProperties"} | 18 | "element": {"#": "selectionProperties"} |
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "subSelectionProperties1": { | ||
22 | "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]", | ||
23 | "properties": { | ||
24 | "element": {"#": "subSelectionProperties"} | ||
25 | } | ||
26 | }, | ||
27 | "object3DProperties1": { | 21 | "object3DProperties1": { |
28 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", | 22 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", |
29 | "properties": { | 23 | "properties": { |
@@ -66,12 +60,6 @@ | |||
66 | } | 60 | } |
67 | } | 61 | } |
68 | }, | 62 | }, |
69 | "pencilProperties1": { | ||
70 | "prototype": "js/components/tools-properties/pencil-properties.reel", | ||
71 | "properties": { | ||
72 | "element": {"#": "pencilProperties"} | ||
73 | } | ||
74 | }, | ||
75 | "brushProperties1": { | 63 | "brushProperties1": { |
76 | "prototype": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
77 | "properties": { | 65 | "properties": { |
@@ -90,12 +78,6 @@ | |||
90 | "element": {"#": "inkbottleProperties"} | 78 | "element": {"#": "inkbottleProperties"} |
91 | } | 79 | } |
92 | }, | 80 | }, |
93 | "eyedropperProperties1": { | ||
94 | "prototype": "js/components/tools-properties/eyedropper-properties.reel", | ||
95 | "properties": { | ||
96 | "element": {"#": "eyedropperProperties"} | ||
97 | } | ||
98 | }, | ||
99 | "eraserProperties1": { | 81 | "eraserProperties1": { |
100 | "prototype": "js/components/tools-properties/eraser-properties.reel", | 82 | "prototype": "js/components/tools-properties/eraser-properties.reel", |
101 | "properties": { | 83 | "properties": { |
@@ -140,18 +122,15 @@ | |||
140 | "properties": { | 122 | "properties": { |
141 | "element": {"#": "toolsProperties"}, | 123 | "element": {"#": "toolsProperties"}, |
142 | "selectionProperties": {"@": "selectionProperties1"}, | 124 | "selectionProperties": {"@": "selectionProperties1"}, |
143 | "subSelectionProperties": {"@": "subSelectionProperties1"}, | ||
144 | "rotate3DProperties": {"@": "object3DProperties1"}, | 125 | "rotate3DProperties": {"@": "object3DProperties1"}, |
145 | "translate3DProperties": {"@": "object3DProperties1"}, | 126 | "translate3DProperties": {"@": "object3DProperties1"}, |
146 | "tagProperties": {"@": "tagProperties1"}, | 127 | "tagProperties": {"@": "tagProperties1"}, |
147 | "penProperties": {"@": "penProperties1"}, | 128 | "penProperties": {"@": "penProperties1"}, |
148 | "textProperties": {"@": "textProperties1"}, | 129 | "textProperties": {"@": "textProperties1"}, |
149 | "shapeProperties": {"@": "shapeProperties1"}, | 130 | "shapeProperties": {"@": "shapeProperties1"}, |
150 | "pencilProperties": {"@": "pencilProperties1"}, | ||
151 | "brushProperties": {"@": "brushProperties1"}, | 131 | "brushProperties": {"@": "brushProperties1"}, |
152 | "fillProperties": {"@": "fillProperties1"}, | 132 | "fillProperties": {"@": "fillProperties1"}, |
153 | "inkbottleProperties": {"@": "inkbottleProperties1"}, | 133 | "inkbottleProperties": {"@": "inkbottleProperties1"}, |
154 | "eyedropperProperties": {"@": "eyedropperProperties1"}, | ||
155 | "eraserProperties": {"@": "eraserProperties1"}, | 134 | "eraserProperties": {"@": "eraserProperties1"}, |
156 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 135 | "rotateStageProperties": {"@": "rotateStageProperties1"}, |
157 | "panProperties": {"@": "panProperties1"}, | 136 | "panProperties": {"@": "panProperties1"}, |
@@ -173,17 +152,14 @@ | |||
173 | <body> | 152 | <body> |
174 | <div data-montage-id="toolsProperties" class="panelBackground"> | 153 | <div data-montage-id="toolsProperties" class="panelBackground"> |
175 | <div data-montage-id="selectionProperties"></div> | 154 | <div data-montage-id="selectionProperties"></div> |
176 | <div data-montage-id="subSelectionProperties"></div> | ||
177 | <div data-montage-id="object3DProperties"></div> | 155 | <div data-montage-id="object3DProperties"></div> |
178 | <div data-montage-id="tagProperties"></div> | 156 | <div data-montage-id="tagProperties"></div> |
179 | <div data-montage-id="penProperties"></div> | 157 | <div data-montage-id="penProperties"></div> |
180 | <div data-montage-id="textProperties"></div> | 158 | <div data-montage-id="textProperties"></div> |
181 | <div data-montage-id="shapeProperties"></div> | 159 | <div data-montage-id="shapeProperties"></div> |
182 | <div data-montage-id="pencilProperties"></div> | ||
183 | <div data-montage-id="brushProperties"></div> | 160 | <div data-montage-id="brushProperties"></div> |
184 | <div data-montage-id="fillProperties"></div> | 161 | <div data-montage-id="fillProperties"></div> |
185 | <div data-montage-id="inkbottleProperties"></div> | 162 | <div data-montage-id="inkbottleProperties"></div> |
186 | <div data-montage-id="eyedropperProperties"></div> | ||
187 | <div data-montage-id="eraserProperties"></div> | 163 | <div data-montage-id="eraserProperties"></div> |
188 | <div data-montage-id="rotateStageProperties"></div> | 164 | <div data-montage-id="rotateStageProperties"></div> |
189 | <div data-montage-id="panProperties"></div> | 165 | <div data-montage-id="panProperties"></div> |