diff options
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.css | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.html | 13 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 1 |
3 files changed, 14 insertions, 4 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 8f6f6d7b..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,10 +403,10 @@ | |||
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 | |||
400 | <section id="popupWindows"></section> | ||
401 | 406 | ||
402 | <div id="modalContainer"></div> | 407 | <div data-montage-id="focus-container" class="hidden"></div> |
408 | |||
409 | <section id="popupWindows"></section> | ||
403 | 410 | ||
404 | </div> | 411 | </div> |
405 | 412 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 88361fd9..2a6e49f7 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -143,7 +143,6 @@ exports.Ninja = Montage.create(Component, { | |||
143 | this.currentDocument = event.detail; | 143 | this.currentDocument = event.detail; |
144 | 144 | ||
145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; | 145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; |
146 | |||
147 | NJevent("openDocument"); | 146 | NJevent("openDocument"); |
148 | } | 147 | } |
149 | }, | 148 | }, |