diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/layout/tools-properties.reel/tools-properties.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index e7d1ac8b..6b766532 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
| @@ -12,37 +12,37 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | 14 | ||
| 15 | "selectionProperties1": { | 15 | "selectionProperties": { |
| 16 | "prototype": "js/components/tools-properties/selection-properties.reel", | 16 | "prototype": "js/components/tools-properties/selection-properties.reel", |
| 17 | "properties": { | 17 | "properties": { |
| 18 | "element": {"#": "selectionProperties"} | 18 | "element": {"#": "selectionProperties"} |
| 19 | } | 19 | } |
| 20 | }, | 20 | }, |
| 21 | "object3DProperties1": { | 21 | "object3DProperties": { |
| 22 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", | 22 | "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", |
| 23 | "properties": { | 23 | "properties": { |
| 24 | "element": {"#": "object3DProperties"} | 24 | "element": {"#": "object3DProperties"} |
| 25 | } | 25 | } |
| 26 | }, | 26 | }, |
| 27 | "tagProperties1": { | 27 | "tagProperties": { |
| 28 | "prototype": "js/components/tools-properties/tag-properties.reel", | 28 | "prototype": "js/components/tools-properties/tag-properties.reel", |
| 29 | "properties": { | 29 | "properties": { |
| 30 | "element": {"#": "tagProperties"} | 30 | "element": {"#": "tagProperties"} |
| 31 | } | 31 | } |
| 32 | }, | 32 | }, |
| 33 | "penProperties1": { | 33 | "penProperties": { |
| 34 | "prototype": "js/components/tools-properties/pen-properties.reel", | 34 | "prototype": "js/components/tools-properties/pen-properties.reel", |
| 35 | "properties": { | 35 | "properties": { |
| 36 | "element": {"#": "penProperties"} | 36 | "element": {"#": "penProperties"} |
| 37 | } | 37 | } |
| 38 | }, | 38 | }, |
| 39 | "textProperties1": { | 39 | "textProperties": { |
| 40 | "prototype": "js/components/tools-properties/text-properties.reel", | 40 | "prototype": "js/components/tools-properties/text-properties.reel", |
| 41 | "properties": { | 41 | "properties": { |
| 42 | "element": {"#": "textProperties"} | 42 | "element": {"#": "textProperties"} |
| 43 | } | 43 | } |
| 44 | }, | 44 | }, |
| 45 | "shapeProperties1": { | 45 | "shapeProperties": { |
| 46 | "prototype": "js/components/tools-properties/shape-properties.reel", | 46 | "prototype": "js/components/tools-properties/shape-properties.reel", |
| 47 | "properties": { | 47 | "properties": { |
| 48 | "element": {"#": "shapeProperties"} | 48 | "element": {"#": "shapeProperties"} |
| @@ -60,43 +60,43 @@ | |||
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | }, | 62 | }, |
| 63 | "brushProperties1": { | 63 | "brushProperties": { |
| 64 | "prototype": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
| 65 | "properties": { | 65 | "properties": { |
| 66 | "element": {"#": "brushProperties"} | 66 | "element": {"#": "brushProperties"} |
| 67 | } | 67 | } |
| 68 | }, | 68 | }, |
| 69 | "fillProperties1": { | 69 | "fillProperties": { |
| 70 | "prototype": "js/components/tools-properties/fill-properties.reel", | 70 | "prototype": "js/components/tools-properties/fill-properties.reel", |
| 71 | "properties": { | 71 | "properties": { |
| 72 | "element": {"#": "fillProperties"} | 72 | "element": {"#": "fillProperties"} |
| 73 | } | 73 | } |
| 74 | }, | 74 | }, |
| 75 | "inkbottleProperties1": { | 75 | "inkbottleProperties": { |
| 76 | "prototype": "js/components/tools-properties/ink-bottle-properties.reel", | 76 | "prototype": "js/components/tools-properties/ink-bottle-properties.reel", |
| 77 | "properties": { | 77 | "properties": { |
| 78 | "element": {"#": "inkbottleProperties"} | 78 | "element": {"#": "inkbottleProperties"} |
| 79 | } | 79 | } |
| 80 | }, | 80 | }, |
| 81 | "eraserProperties1": { | 81 | "eraserProperties": { |
| 82 | "prototype": "js/components/tools-properties/eraser-properties.reel", | 82 | "prototype": "js/components/tools-properties/eraser-properties.reel", |
| 83 | "properties": { | 83 | "properties": { |
| 84 | "element": {"#": "eraserProperties"} | 84 | "element": {"#": "eraserProperties"} |
| 85 | } | 85 | } |
| 86 | }, | 86 | }, |
| 87 | "rotateStageProperties1": { | 87 | "rotateStageProperties": { |
| 88 | "prototype": "js/components/tools-properties/rotate-stage-properties.reel", | 88 | "prototype": "js/components/tools-properties/rotate-stage-properties.reel", |
| 89 | "properties": { | 89 | "properties": { |
| 90 | "element": {"#": "rotateStageProperties"} | 90 | "element": {"#": "rotateStageProperties"} |
| 91 | } | 91 | } |
| 92 | }, | 92 | }, |
| 93 | "panProperties1": { | 93 | "panProperties": { |
| 94 | "prototype": "js/components/tools-properties/pan-properties.reel", | 94 | "prototype": "js/components/tools-properties/pan-properties.reel", |
| 95 | "properties": { | 95 | "properties": { |
| 96 | "element": {"#": "panProperties"} | 96 | "element": {"#": "panProperties"} |
| 97 | } | 97 | } |
| 98 | }, | 98 | }, |
| 99 | "zoomProperties1": { | 99 | "zoomProperties": { |
| 100 | "prototype": "js/components/tools-properties/zoom-properties.reel", | 100 | "prototype": "js/components/tools-properties/zoom-properties.reel", |
| 101 | "properties": { | 101 | "properties": { |
| 102 | "element": {"#": "zoomProperties"} | 102 | "element": {"#": "zoomProperties"} |
| @@ -121,20 +121,20 @@ | |||
| 121 | "prototype": "js/components/layout/tools-properties.reel", | 121 | "prototype": "js/components/layout/tools-properties.reel", |
| 122 | "properties": { | 122 | "properties": { |
| 123 | "element": {"#": "toolsProperties"}, | 123 | "element": {"#": "toolsProperties"}, |
| 124 | "selectionProperties": {"@": "selectionProperties1"}, | 124 | "selectionProperties": {"@": "selectionProperties"}, |
| 125 | "rotate3DProperties": {"@": "object3DProperties1"}, | 125 | "rotate3DProperties": {"@": "object3DProperties"}, |
| 126 | "translate3DProperties": {"@": "object3DProperties1"}, | 126 | "translate3DProperties": {"@": "object3DProperties"}, |
| 127 | "tagProperties": {"@": "tagProperties1"}, | 127 | "tagProperties": {"@": "tagProperties"}, |
| 128 | "penProperties": {"@": "penProperties1"}, | 128 | "penProperties": {"@": "penProperties"}, |
| 129 | "textProperties": {"@": "textProperties1"}, | 129 | "textProperties": {"@": "textProperties"}, |
| 130 | "shapeProperties": {"@": "shapeProperties1"}, | 130 | "shapeProperties": {"@": "shapeProperties"}, |
| 131 | "brushProperties": {"@": "brushProperties1"}, | 131 | "brushProperties": {"@": "brushProperties"}, |
| 132 | "fillProperties": {"@": "fillProperties1"}, | 132 | "fillProperties": {"@": "fillProperties"}, |
| 133 | "inkbottleProperties": {"@": "inkbottleProperties1"}, | 133 | "inkbottleProperties": {"@": "inkbottleProperties"}, |
| 134 | "eraserProperties": {"@": "eraserProperties1"}, | 134 | "eraserProperties": {"@": "eraserProperties"}, |
| 135 | "rotateStageProperties": {"@": "rotateStageProperties1"}, | 135 | "rotateStageProperties": {"@": "rotateStageProperties"}, |
| 136 | "panProperties": {"@": "panProperties1"}, | 136 | "panProperties": {"@": "panProperties"}, |
| 137 | "zoomProperties": {"@": "zoomProperties1"} | 137 | "zoomProperties": {"@": "zoomProperties"} |
| 138 | }, | 138 | }, |
| 139 | "bindings": { | 139 | "bindings": { |
| 140 | "currentSelectedTool": { | 140 | "currentSelectedTool": { |