diff options
author | Valerio Virgillito | 2012-03-15 16:28:39 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-15 16:28:39 -0700 |
commit | bb6449a3a2adcbc1d109a042e4ee23e7b2614821 (patch) | |
tree | 9d7a8eb7e1bb06f5402117315e61218b74cc105f /js/stage/stage.reel/stage.html | |
parent | db59414f48d79f8f959dcc105cfaf616268ca235 (diff) | |
parent | 1d0a4ae3e1a051c7cf1ac02ebbc03f48d1cdfb6c (diff) | |
download | ninja-bb6449a3a2adcbc1d109a042e4ee23e7b2614821.tar.gz |
Merge pull request #118 from mencio/pi-fixes
Fixed issues with Properties panel, focus and grid redraw
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": { |