aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 09:59:01 -0700
committerJose Antonio Marquez2012-06-27 09:59:01 -0700
commitca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (patch)
tree2bf23250a605ca42a33f7bc75698357e0258d624 /js/stage/stage.reel/stage.html
parent245e70117f9605dc5603328c97685b2e5a10f220 (diff)
parent2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff)
downloadninja-ca1e79d4dc36a55c47b6f8cb92069eafc95383b5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rwxr-xr-xjs/stage/stage.reel/stage.html12
1 files changed, 10 insertions, 2 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 2ed596f3..215f8f2e 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -40,7 +40,13 @@
40 "focusManager": { 40 "focusManager": {
41 "object": "js/components/focus-manager.reel" 41 "object": "js/components/focus-manager.reel"
42 }, 42 },
43 43
44 "bindingView": {
45 "prototype": "js/stage/binding-view.reel",
46 "properties" : {
47 "element": {"#": "bindingView" }
48 }
49 },
44 "owner": { 50 "owner": {
45 "prototype": "js/stage/stage.reel", 51 "prototype": "js/stage/stage.reel",
46 "properties": { 52 "properties": {
@@ -53,7 +59,8 @@
53 "stageDeps": {"@": "stageDeps"}, 59 "stageDeps": {"@": "stageDeps"},
54 "layout": {"@": "layout"}, 60 "layout": {"@": "layout"},
55 "textTool": {"@": "textTool"}, 61 "textTool": {"@": "textTool"},
56 "focusManager": {"@": "focusManager"} 62 "focusManager": {"@": "focusManager"},
63 "bindingView": {"@": "bindingView"}
57 }, 64 },
58 "bindings": { 65 "bindings": {
59 "currentDocumentStageView": { 66 "currentDocumentStageView": {
@@ -77,6 +84,7 @@
77 <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> 84 <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
78 <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> 85 <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
79 <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> 86 <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
87 <section data-montage-id="bindingView"></section>
80 </section> 88 </section>
81 89
82</body> 90</body>