diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/stage/stage.reel/stage.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 12a331c3..30c3d231 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -79,13 +79,13 @@ | |||
| 79 | </head> | 79 | </head> |
| 80 | <body> | 80 | <body> |
| 81 | 81 | ||
| 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section id="stageView"></section> | 83 | <section data-montage-id="stageView"></section> |
| 84 | <section id="iframeContainer"></section> | 84 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> |
| 85 | <section id="textToolObject"></section> | 85 | <section data-montage-id="textToolObject"></section> |
| 86 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
| 87 | <canvas id="stageCanvas"></canvas> | 87 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
| 88 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
| 89 | </section> | 89 | </section> |
| 90 | 90 | ||
| 91 | </body> | 91 | </body> |