diff options
author | Jose Antonio Marquez | 2012-02-14 11:23:15 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-14 11:23:15 -0800 |
commit | a956f7919cf43424c2675cce24c5637f9064dcb3 (patch) | |
tree | a308fe7eacec2156c8212dff0892a3de925d5f9a /js/controllers | |
parent | 33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff) | |
parent | f766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff) | |
download | ninja-a956f7919cf43424c2675cce24c5637f9064dcb3.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/controllers')
-rw-r--r-- | js/controllers/main-menu-controller.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/main-menu-controller.js b/js/controllers/main-menu-controller.js index 5e126617..2b848b9f 100644 --- a/js/controllers/main-menu-controller.js +++ b/js/controllers/main-menu-controller.js | |||
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | 7 | ||
8 | var Montage = require("montage/core/core").Montage, | 8 | var Montage = require("montage/core/core").Montage, |
9 | Component = require("montage/ui/component").Component; | 9 | Component = require("montage/ui/component").Component, |
10 | AboutBoxPopup = require("js/components/about-box.reel").AboutBox; | ||
10 | 11 | ||
11 | exports.MainMenuController = Montage.create(Component, { | 12 | exports.MainMenuController = Montage.create(Component, { |
12 | deserializedFromTemplate:{ | 13 | deserializedFromTemplate:{ |
@@ -36,8 +37,7 @@ exports.MainMenuController = Montage.create(Component, { | |||
36 | }, | 37 | }, |
37 | handleExecuteHelpAbout:{ | 38 | handleExecuteHelpAbout:{ |
38 | value:function () { | 39 | value:function () { |
39 | // TODO | 40 | AboutBoxPopup.show(); |
40 | console.log("Pull up the about popup"); | ||
41 | } | 41 | } |
42 | } | 42 | } |
43 | }); | 43 | }); |