diff options
| author | Valerio Virgillito | 2012-02-17 15:55:18 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-17 15:55:18 -0800 |
| commit | e23708721a71ca4c71365f5f8e8ac7d6113926db (patch) | |
| tree | d7a109dc75f415012790bf85fef94249a65421ad /js/stage/stage.reel/stage.html | |
| parent | de4e42ce73ac12f63d95db2fdce87e57db5593fb (diff) | |
| parent | 9bfdc1fff649fa4a086e7dc291af21b431a5b95c (diff) | |
| download | ninja-e23708721a71ca4c71365f5f8e8ac7d6113926db.tar.gz | |
Merge pull request #55 from mencio/nested-selection
Re-adding stage mouse wheel scrolling
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 9ed0f636..812e3d55 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section id="stageView"></section> | 83 | <section id="stageView"></section> |
| 84 | <section id="iframeContainer"></section> | 84 | <section id="iframeContainer"></section> |
| 85 | <section id="textToolObject">asdasd asd asd asd asd asd </section> | 85 | <section id="textToolObject"></section> |
| 86 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas id="layoutCanvas"></canvas> |
| 87 | <canvas id="stageCanvas"></canvas> | 87 | <canvas id="stageCanvas"></canvas> |
| 88 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas id="drawingCanvas"></canvas> |