aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/components/layout/tools-properties.reel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/layout/tools-properties.reel')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html54
1 files changed, 15 insertions, 39 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..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"},
@@ -171,24 +150,21 @@
171 </head> 150 </head>
172 151
173 <body> 152 <body>
174 <div id="toolsProperties" class="panelBackground"> 153 <div data-montage-id="toolsProperties" class="panelBackground">
175 <div id="selectionProperties"></div> 154 <div data-montage-id="selectionProperties"></div>
176 <div id="subSelectionProperties"></div> 155 <div data-montage-id="object3DProperties"></div>
177 <div id="object3DProperties"></div> 156 <div data-montage-id="tagProperties"></div>
178 <div id="tagProperties"></div> 157 <div data-montage-id="penProperties"></div>
179 <div id="penProperties"></div> 158 <div data-montage-id="textProperties"></div>
180 <div id="textProperties"></div> 159 <div data-montage-id="shapeProperties"></div>
181 <div id="shapeProperties"></div> 160 <div data-montage-id="brushProperties"></div>
182 <div id="pencilProperties"></div> 161 <div data-montage-id="fillProperties"></div>
183 <div id="brushProperties"></div> 162 <div data-montage-id="inkbottleProperties"></div>
184 <div id="fillProperties"></div> 163 <div data-montage-id="eraserProperties"></div>
185 <div id="inkbottleProperties"></div> 164 <div data-montage-id="rotateStageProperties"></div>
186 <div id="eyedropperProperties"></div> 165 <div data-montage-id="panProperties"></div>
187 <div id="eraserProperties"></div> 166 <div data-montage-id="zoomProperties"></div>
188 <div id="rotateStageProperties"></div> 167 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
189 <div id="panProperties"></div>
190 <div id="zoomProperties"></div>
191 <div id="disabledCondition" class="panelDisabled"></div>
192 </div> 168 </div>
193 </body> 169 </body>
194</html> 170</html>