diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/stage/stage.reel/stage.html | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 53410382..397af0b6 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -11,37 +11,27 @@ | |||
| 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 | ||
| 43 | "textTool": { | 33 | "textTool": { |
| 44 | "prototype": "node_modules/labs/rich-text-editor.reel", | 34 | "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel", |
| 45 | "properties": { | 35 | "properties": { |
| 46 | "element" : {"#": "textToolObject"} | 36 | "element" : {"#": "textToolObject"} |
| 47 | } | 37 | } |
| @@ -63,11 +53,11 @@ | |||
| 63 | "element": {"#": "stageAndScenesContainer"}, | 53 | "element": {"#": "stageAndScenesContainer"}, |
| 64 | "_iframeContainer": {"#": "iframeContainer"}, | 54 | "_iframeContainer": {"#": "iframeContainer"}, |
| 65 | "_layoutCanvas": {"#": "layoutCanvas"}, | 55 | "_layoutCanvas": {"#": "layoutCanvas"}, |
| 56 | "_gridCanvas": {"#": "gridCanvas"}, | ||
| 66 | "_canvas": {"#": "stageCanvas"}, | 57 | "_canvas": {"#": "stageCanvas"}, |
| 67 | "_drawingCanvas": {"#": "drawingCanvas"}, | 58 | "_drawingCanvas": {"#": "drawingCanvas"}, |
| 68 | "stageDeps": {"@": "StageDeps1"}, | 59 | "stageDeps": {"@": "stageDeps"}, |
| 69 | "layout": {"@": "layout1"}, | 60 | "layout": {"@": "layout"}, |
| 70 | "stageView": {"@": "stageView"}, | ||
| 71 | "textTool": {"@": "textTool"}, | 61 | "textTool": {"@": "textTool"}, |
| 72 | "focusManager": {"@": "focusManager"}, | 62 | "focusManager": {"@": "focusManager"}, |
| 73 | "bindingView": {"@": "bindingView"} | 63 | "bindingView": {"@": "bindingView"} |
| @@ -87,9 +77,10 @@ | |||
| 87 | <body> | 77 | <body> |
| 88 | 78 | ||
| 89 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> | 79 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 90 | <section data-montage-id="stageView"></section> | 80 | <section id="codeViewContainer" class="codeViewContainer"></section> |
| 91 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> | 81 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> |
| 92 | <section data-montage-id="textToolObject"></section> | 82 | <section data-montage-id="textToolObject"></section> |
| 83 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> | ||
| 93 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> | 84 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
| 94 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> | 85 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
| 95 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> | 86 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |