diff options
author | Armen Kesablyan | 2012-03-19 11:01:00 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-03-19 11:01:00 -0700 |
commit | 60107392554fa993a16e748f7281be423055cd19 (patch) | |
tree | 408b7b9422265d29df2c37eb6a120c09812abf2c /js/stage/stage.reel/stage.html | |
parent | 725bb869618b9e0ebb2820a24bca5d1cf53a4810 (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-60107392554fa993a16e748f7281be423055cd19.tar.gz |
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rwxr-xr-x | js/stage/stage.reel/stage.html | 7 |
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": { |