diff options
author | Eric Guzman | 2012-06-15 18:34:22 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-15 18:34:22 -0700 |
commit | c144c6921d42fe96c18045b1c2a9822a467b1253 (patch) | |
tree | 5bbabc73e96e3d4aad5e19044f40408b3fa63b72 /js/stage/stage.reel/stage.html | |
parent | 057afac9e7b99a3c4339003cca19ec3962d5fa13 (diff) | |
download | ninja-c144c6921d42fe96c18045b1c2a9822a467b1253.tar.gz |
Objects Tray - Moved to stage object from binding view
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rwxr-xr-x | js/stage/stage.reel/stage.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 397af0b6..acab4b1b 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
@@ -47,6 +47,12 @@ | |||
47 | "element": {"#": "bindingView" } | 47 | "element": {"#": "bindingView" } |
48 | } | 48 | } |
49 | }, | 49 | }, |
50 | "objectsTray" : { | ||
51 | "prototype": "js/stage/objects-tray.reel", | ||
52 | "properties": { | ||
53 | "element": {"#": "objects-tray" } | ||
54 | } | ||
55 | }, | ||
50 | "owner": { | 56 | "owner": { |
51 | "prototype": "js/stage/stage.reel", | 57 | "prototype": "js/stage/stage.reel", |
52 | "properties": { | 58 | "properties": { |
@@ -83,6 +89,12 @@ | |||
83 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> | 89 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> |
84 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> | 90 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
85 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> | 91 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
92 | <div class="stage-tray-container"> | ||
93 | <div class="objects-tray-container"> | ||
94 | <div data-montage-id="objects-tray" ></div> | ||
95 | </div> | ||
96 | </div> | ||
97 | |||
86 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> | 98 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
87 | <section data-montage-id="bindingView" class="bindingView"></section> | 99 | <section data-montage-id="bindingView" class="bindingView"></section> |
88 | </section> | 100 | </section> |