diff options
author | Eric Guzman | 2012-02-13 10:29:49 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 10:29:49 -0800 |
commit | e4893f7d3c3b9bd7967973197c3ffb5d3a075c91 (patch) | |
tree | f3d4fd9d96ba0dcf846fbf66153fb443bd60f767 /js/stage/stage.reel/stage.html | |
parent | ef032412216d437ce1c7dfc9050ab41adf0594c0 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-e4893f7d3c3b9bd7967973197c3ffb5d3a075c91.tar.gz |
Merge branch 'refs/heads/master' into TreeComponents
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rw-r--r-- | js/stage/stage.reel/stage.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 49d10baf..623c54b8 100644 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
@@ -34,6 +34,14 @@ | |||
34 | } | 34 | } |
35 | } | 35 | } |
36 | }, | 36 | }, |
37 | |||
38 | "textTool": { | ||
39 | "module": "node_modules/labs/rich-text-editor.reel", | ||
40 | "name": "RichTextEditor", | ||
41 | "properties": { | ||
42 | "element" : {"#": "textToolObject"} | ||
43 | } | ||
44 | }, | ||
37 | 45 | ||
38 | "owner": { | 46 | "owner": { |
39 | "module": "js/stage/stage.reel", | 47 | "module": "js/stage/stage.reel", |
@@ -46,7 +54,8 @@ | |||
46 | "_canvas": {"#": "stageCanvas"}, | 54 | "_canvas": {"#": "stageCanvas"}, |
47 | "_drawingCanvas": {"#": "drawingCanvas"}, | 55 | "_drawingCanvas": {"#": "drawingCanvas"}, |
48 | "stageDeps": {"@": "StageDeps1"}, | 56 | "stageDeps": {"@": "StageDeps1"}, |
49 | "layout": {"@": "layout1"} | 57 | "layout": {"@": "layout1"}, |
58 | "textTool": {"@": "textTool"} | ||
50 | }, | 59 | }, |
51 | "bindings": { | 60 | "bindings": { |
52 | "currentDocumentStageView": { | 61 | "currentDocumentStageView": { |
@@ -64,6 +73,7 @@ | |||
64 | 73 | ||
65 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 74 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> |
66 | <section id="iframeContainer"></section> | 75 | <section id="iframeContainer"></section> |
76 | <section id="textToolObject">asdasd asd asd asd asd asd </section> | ||
67 | <section id="codeViewContainer"></section> | 77 | <section id="codeViewContainer"></section> |
68 | <canvas id="layoutCanvas"></canvas> | 78 | <canvas id="layoutCanvas"></canvas> |
69 | <canvas id="stageCanvas"></canvas> | 79 | <canvas id="stageCanvas"></canvas> |