diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/stage/stage.reel/stage.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index f796303c..30c3d231 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -12,24 +12,21 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "stageView" : { | 14 | "stageView" : { |
| 15 | "module": "js/stage/stage-view.reel", | 15 | "prototype": "js/stage/stage-view.reel", |
| 16 | "name": "StageView", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "stageView"} | 17 | "element": {"#": "stageView"} |
| 19 | } | 18 | } |
| 20 | }, | 19 | }, |
| 21 | 20 | ||
| 22 | "StageDeps1": { | 21 | "StageDeps1": { |
| 23 | "module": "js/stage/stage-deps", | 22 | "prototype": "js/stage/stage-deps", |
| 24 | "name": "StageDeps", | ||
| 25 | "properties": { | 23 | "properties": { |
| 26 | "stage": {"@": "owner"} | 24 | "stage": {"@": "owner"} |
| 27 | } | 25 | } |
| 28 | }, | 26 | }, |
| 29 | 27 | ||
| 30 | "layout1": { | 28 | "layout1": { |
| 31 | "module": "js/stage/layout", | 29 | "prototype": "js/stage/layout", |
| 32 | "name": "Layout", | ||
| 33 | "properties": { | 30 | "properties": { |
| 34 | "canvas": {"#": "layoutCanvas"}, | 31 | "canvas": {"#": "layoutCanvas"}, |
| 35 | "stage": {"@": "owner"} | 32 | "stage": {"@": "owner"} |
| @@ -44,8 +41,7 @@ | |||
| 44 | }, | 41 | }, |
| 45 | 42 | ||
| 46 | "textTool": { | 43 | "textTool": { |
| 47 | "module": "node_modules/labs/rich-text-editor.reel", | 44 | "prototype": "node_modules/labs/rich-text-editor.reel", |
| 48 | "name": "RichTextEditor", | ||
| 49 | "properties": { | 45 | "properties": { |
| 50 | "element" : {"#": "textToolObject"} | 46 | "element" : {"#": "textToolObject"} |
| 51 | } | 47 | } |
| @@ -56,8 +52,7 @@ | |||
| 56 | }, | 52 | }, |
| 57 | 53 | ||
| 58 | "owner": { | 54 | "owner": { |
| 59 | "module": "js/stage/stage.reel", | 55 | "prototype": "js/stage/stage.reel", |
| 60 | "name": "Stage", | ||
| 61 | "properties": { | 56 | "properties": { |
| 62 | "element": {"#": "stageAndScenesContainer"}, | 57 | "element": {"#": "stageAndScenesContainer"}, |
| 63 | "_iframeContainer": {"#": "iframeContainer"}, | 58 | "_iframeContainer": {"#": "iframeContainer"}, |
| @@ -84,13 +79,13 @@ | |||
| 84 | </head> | 79 | </head> |
| 85 | <body> | 80 | <body> |
| 86 | 81 | ||
| 87 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 88 | <section id="stageView"></section> | 83 | <section data-montage-id="stageView"></section> |
| 89 | <section id="iframeContainer"></section> | 84 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> |
| 90 | <section id="textToolObject"></section> | 85 | <section data-montage-id="textToolObject"></section> |
| 91 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
| 92 | <canvas id="stageCanvas"></canvas> | 87 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
| 93 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
| 94 | </section> | 89 | </section> |
| 95 | 90 | ||
| 96 | </body> | 91 | </body> |