aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-15 21:07:44 -0700
committerJose Antonio Marquez2012-03-15 21:07:44 -0700
commit980c27df9de95395dcedf7c3802aa96904147aa3 (patch)
tree182c616df3a05f6d1f4845707d3393ebcfdecc44 /js/stage/stage.reel/stage.html
parent810b6a194c8cad0909de72fb97310f67e3ccc822 (diff)
parenta9cd3284a16619dae36122b92e21f888526364e4 (diff)
downloadninja-980c27df9de95395dcedf7c3802aa96904147aa3.tar.gz
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rwxr-xr-xjs/stage/stage.reel/stage.html7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 812e3d55..f796303c 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -50,6 +50,10 @@
50 "element" : {"#": "textToolObject"} 50 "element" : {"#": "textToolObject"}
51 } 51 }
52 }, 52 },
53
54 "focusManager": {
55 "object": "js/components/focus-manager.reel"
56 },
53 57
54 "owner": { 58 "owner": {
55 "module": "js/stage/stage.reel", 59 "module": "js/stage/stage.reel",
@@ -63,7 +67,8 @@
63 "stageDeps": {"@": "StageDeps1"}, 67 "stageDeps": {"@": "StageDeps1"},
64 "layout": {"@": "layout1"}, 68 "layout": {"@": "layout1"},
65 "stageView": {"@": "stageView"}, 69 "stageView": {"@": "stageView"},
66 "textTool": {"@": "textTool"} 70 "textTool": {"@": "textTool"},
71 "focusManager": {"@": "focusManager"}
67 }, 72 },
68 "bindings": { 73 "bindings": {
69 "currentDocumentStageView": { 74 "currentDocumentStageView": {