diff options
author | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
commit | 846d539997bf188b9caf63cdf0008367fe6c9ede (patch) | |
tree | ae0ed9293cd5859cd10694fb2e045b2101ed8df8 /js/ninja.reel | |
parent | 595a569cf459e7e7cbe19e546c23322b56e44341 (diff) | |
parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
download | ninja-846d539997bf188b9caf63cdf0008367fe6c9ede.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.css | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.html | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 83c0e569..61251eff 100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
@@ -7,3 +7,7 @@ | |||
7 | .main { | 7 | .main { |
8 | padding: 100px; | 8 | padding: 100px; |
9 | } | 9 | } |
10 | |||
11 | .hidden { | ||
12 | display: none; | ||
13 | } | ||
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 3dc45498..f9e1efdd 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -287,6 +287,13 @@ | |||
287 | "name": "MainMenuController" | 287 | "name": "MainMenuController" |
288 | }, | 288 | }, |
289 | 289 | ||
290 | "focusManager": { | ||
291 | "object": "js/components/focus-manager.reel", | ||
292 | "properties": { | ||
293 | "element": {"#": "focus-container" } | ||
294 | } | ||
295 | }, | ||
296 | |||
290 | "owner": { | 297 | "owner": { |
291 | "module": "js/ninja.reel", | 298 | "module": "js/ninja.reel", |
292 | "name": "Ninja", | 299 | "name": "Ninja", |
@@ -396,7 +403,9 @@ | |||
396 | 403 | ||
397 | <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section> | 404 | <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section> |
398 | </section> | 405 | </section> |
399 | 406 | ||
407 | <div data-montage-id="focus-container" class="hidden"></div> | ||
408 | |||
400 | <section id="popupWindows"></section> | 409 | <section id="popupWindows"></section> |
401 | 410 | ||
402 | </div> | 411 | </div> |