diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/layout/tools-properties.reel/tools-properties.html | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
| -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 9061cd12..ffaa0fca 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": { |
| @@ -146,18 +128,15 @@ | |||
| 146 | "properties": { | 128 | "properties": { |
| 147 | "element": {"#": "toolsProperties"}, | 129 | "element": {"#": "toolsProperties"}, |
| 148 | "selectionProperties": {"@": "selectionProperties1"}, | 130 | "selectionProperties": {"@": "selectionProperties1"}, |
| 149 | "subSelectionProperties": {"@": "subSelectionProperties1"}, | ||
| 150 | "rotate3DProperties": {"@": "object3DProperties1"}, | 131 | "rotate3DProperties": {"@": "object3DProperties1"}, |
| 151 | "translate3DProperties": {"@": "object3DProperties1"}, | 132 | "translate3DProperties": {"@": "object3DProperties1"}, |
| 152 | "tagProperties": {"@": "tagProperties1"}, | 133 | "tagProperties": {"@": "tagProperties1"}, |
| 153 | "penProperties": {"@": "penProperties1"}, | 134 | "penProperties": {"@": "penProperties1"}, |
| 154 | "textProperties": {"@": "textProperties1"}, | 135 | "textProperties": {"@": "textProperties1"}, |
| 155 | "shapeProperties": {"@": "shapeProperties1"}, | 136 | "shapeProperties": {"@": "shapeProperties1"}, |
| 156 | "pencilProperties": {"@": "pencilProperties1"}, | ||
| 157 | "brushProperties": {"@": "brushProperties1"}, | 137 | "brushProperties": {"@": "brushProperties1"}, |
| 158 | "fillProperties": {"@": "fillProperties1"}, | 138 | "fillProperties": {"@": "fillProperties1"}, |
| 159 | "inkbottleProperties": {"@": "inkbottleProperties1"}, | 139 | "inkbottleProperties": {"@": "inkbottleProperties1"}, |
| 160 | "eyedropperProperties": {"@": "eyedropperProperties1"}, | ||
| 161 | "eraserProperties": {"@": "eraserProperties1"}, | 140 | "eraserProperties": {"@": "eraserProperties1"}, |
| 162 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 141 | "rotateStageProperties": {"@": "rotateStageProperties1"}, |
| 163 | "panProperties": {"@": "panProperties1"}, | 142 | "panProperties": {"@": "panProperties1"}, |
| @@ -180,17 +159,14 @@ | |||
| 180 | <body> | 159 | <body> |
| 181 | <div data-montage-id="toolsProperties" class="panelBackground"> | 160 | <div data-montage-id="toolsProperties" class="panelBackground"> |
| 182 | <div data-montage-id="selectionProperties"></div> | 161 | <div data-montage-id="selectionProperties"></div> |
| 183 | <div data-montage-id="subSelectionProperties"></div> | ||
| 184 | <div data-montage-id="object3DProperties"></div> | 162 | <div data-montage-id="object3DProperties"></div> |
| 185 | <div data-montage-id="tagProperties"></div> | 163 | <div data-montage-id="tagProperties"></div> |
| 186 | <div data-montage-id="penProperties"></div> | 164 | <div data-montage-id="penProperties"></div> |
| 187 | <div data-montage-id="textProperties"></div> | 165 | <div data-montage-id="textProperties"></div> |
| 188 | <div data-montage-id="shapeProperties"></div> | 166 | <div data-montage-id="shapeProperties"></div> |
| 189 | <div data-montage-id="pencilProperties"></div> | ||
| 190 | <div data-montage-id="brushProperties"></div> | 167 | <div data-montage-id="brushProperties"></div> |
| 191 | <div data-montage-id="fillProperties"></div> | 168 | <div data-montage-id="fillProperties"></div> |
| 192 | <div data-montage-id="inkbottleProperties"></div> | 169 | <div data-montage-id="inkbottleProperties"></div> |
| 193 | <div data-montage-id="eyedropperProperties"></div> | ||
| 194 | <div data-montage-id="eraserProperties"></div> | 170 | <div data-montage-id="eraserProperties"></div> |
| 195 | <div data-montage-id="rotateStageProperties"></div> | 171 | <div data-montage-id="rotateStageProperties"></div> |
| 196 | <div data-montage-id="panProperties"></div> | 172 | <div data-montage-id="panProperties"></div> |