diff options
| author | Valerio Virgillito | 2012-02-15 16:09:47 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-15 16:09:47 -0800 |
| commit | d366c0bd1af6471511217ed574083e15059519b5 (patch) | |
| tree | c8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /js/stage/stage.reel/stage.html | |
| parent | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff) | |
| parent | b85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff) | |
| download | ninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz | |
Merge branch 'refs/heads/integration'
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x[-rw-r--r--] | js/stage/stage.reel/stage.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 623c54b8..9ed0f636 100644..100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -11,6 +11,14 @@ | |||
| 11 | 11 | ||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "stageView" : { | ||
| 15 | "module": "js/stage/stage-view.reel", | ||
| 16 | "name": "StageView", | ||
| 17 | "properties": { | ||
| 18 | "element": {"#": "stageView"} | ||
| 19 | } | ||
| 20 | }, | ||
| 21 | |||
| 14 | "StageDeps1": { | 22 | "StageDeps1": { |
| 15 | "module": "js/stage/stage-deps", | 23 | "module": "js/stage/stage-deps", |
| 16 | "name": "StageDeps", | 24 | "name": "StageDeps", |
| @@ -49,12 +57,12 @@ | |||
| 49 | "properties": { | 57 | "properties": { |
| 50 | "element": {"#": "stageAndScenesContainer"}, | 58 | "element": {"#": "stageAndScenesContainer"}, |
| 51 | "_iframeContainer": {"#": "iframeContainer"}, | 59 | "_iframeContainer": {"#": "iframeContainer"}, |
| 52 | "codeViewContainer": {"#": "codeViewContainer"}, | ||
| 53 | "_layoutCanvas": {"#": "layoutCanvas"}, | 60 | "_layoutCanvas": {"#": "layoutCanvas"}, |
| 54 | "_canvas": {"#": "stageCanvas"}, | 61 | "_canvas": {"#": "stageCanvas"}, |
| 55 | "_drawingCanvas": {"#": "drawingCanvas"}, | 62 | "_drawingCanvas": {"#": "drawingCanvas"}, |
| 56 | "stageDeps": {"@": "StageDeps1"}, | 63 | "stageDeps": {"@": "StageDeps1"}, |
| 57 | "layout": {"@": "layout1"}, | 64 | "layout": {"@": "layout1"}, |
| 65 | "stageView": {"@": "stageView"}, | ||
| 58 | "textTool": {"@": "textTool"} | 66 | "textTool": {"@": "textTool"} |
| 59 | }, | 67 | }, |
| 60 | "bindings": { | 68 | "bindings": { |
| @@ -72,9 +80,9 @@ | |||
| 72 | <body> | 80 | <body> |
| 73 | 81 | ||
| 74 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section id="stageView"></section> | ||
| 75 | <section id="iframeContainer"></section> | 84 | <section id="iframeContainer"></section> |
| 76 | <section id="textToolObject">asdasd asd asd asd asd asd </section> | 85 | <section id="textToolObject">asdasd asd asd asd asd asd </section> |
| 77 | <section id="codeViewContainer"></section> | ||
| 78 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas id="layoutCanvas"></canvas> |
| 79 | <canvas id="stageCanvas"></canvas> | 87 | <canvas id="stageCanvas"></canvas> |
| 80 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas id="drawingCanvas"></canvas> |