aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-13 11:59:19 -0800
committerArmen Kesablyan2012-02-13 11:59:19 -0800
commit90d0c8c0e98d062c628c061fe5765ce991fda409 (patch)
tree9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/stage
parent8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage')
-rw-r--r--js/stage/stage.reel/stage.html12
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>