diff options
| author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
| commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
| tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/stage/stage.reel/stage.html | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 30c3d231..7a9619cd 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -11,32 +11,22 @@ | |||
| 11 | 11 | ||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "stageView" : { | 14 | "stageDeps": { |
| 15 | "prototype": "js/stage/stage-view.reel", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "stageView"} | ||
| 18 | } | ||
| 19 | }, | ||
| 20 | |||
| 21 | "StageDeps1": { | ||
| 22 | "prototype": "js/stage/stage-deps", | 15 | "prototype": "js/stage/stage-deps", |
| 23 | "properties": { | 16 | "properties": { |
| 24 | "stage": {"@": "owner"} | 17 | "stage": {"@": "owner"} |
| 25 | } | 18 | } |
| 26 | }, | 19 | }, |
| 27 | 20 | ||
| 28 | "layout1": { | 21 | "layout": { |
| 29 | "prototype": "js/stage/layout", | 22 | "prototype": "js/stage/layout", |
| 30 | "properties": { | 23 | "properties": { |
| 31 | "canvas": {"#": "layoutCanvas"}, | 24 | "canvas": {"#": "layoutCanvas"}, |
| 32 | "stage": {"@": "owner"} | 25 | "stage": {"@": "owner"} |
| 33 | }, | 26 | }, |
| 34 | "bindings": { | 27 | "bindings": { |
| 35 | "layoutView": { | 28 | "layoutView": {"<-": "@owner.appModel.layoutView"}, |
| 36 | "boundObject": {"@": "owner" }, | 29 | "currentDocument": {"<-": "@owner.currentDocument"} |
| 37 | "boundObjectPropertyPath": "appModel.layoutView", | ||
| 38 | "oneway": true | ||
| 39 | } | ||
| 40 | } | 30 | } |
| 41 | }, | 31 | }, |
| 42 | 32 | ||
| @@ -57,11 +47,11 @@ | |||
| 57 | "element": {"#": "stageAndScenesContainer"}, | 47 | "element": {"#": "stageAndScenesContainer"}, |
| 58 | "_iframeContainer": {"#": "iframeContainer"}, | 48 | "_iframeContainer": {"#": "iframeContainer"}, |
| 59 | "_layoutCanvas": {"#": "layoutCanvas"}, | 49 | "_layoutCanvas": {"#": "layoutCanvas"}, |
| 50 | "_gridCanvas": {"#": "gridCanvas"}, | ||
| 60 | "_canvas": {"#": "stageCanvas"}, | 51 | "_canvas": {"#": "stageCanvas"}, |
| 61 | "_drawingCanvas": {"#": "drawingCanvas"}, | 52 | "_drawingCanvas": {"#": "drawingCanvas"}, |
| 62 | "stageDeps": {"@": "StageDeps1"}, | 53 | "stageDeps": {"@": "stageDeps"}, |
| 63 | "layout": {"@": "layout1"}, | 54 | "layout": {"@": "layout"}, |
| 64 | "stageView": {"@": "stageView"}, | ||
| 65 | "textTool": {"@": "textTool"}, | 55 | "textTool": {"@": "textTool"}, |
| 66 | "focusManager": {"@": "focusManager"} | 56 | "focusManager": {"@": "focusManager"} |
| 67 | }, | 57 | }, |
| @@ -80,9 +70,10 @@ | |||
| 80 | <body> | 70 | <body> |
| 81 | 71 | ||
| 82 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> | 72 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section data-montage-id="stageView"></section> | 73 | <section id="codeViewContainer" class="codeViewContainer"></section> |
| 84 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> | 74 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> |
| 85 | <section data-montage-id="textToolObject"></section> | 75 | <section data-montage-id="textToolObject"></section> |
| 76 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> | ||
| 86 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> | 77 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
| 87 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> | 78 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
| 88 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> | 79 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |