aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/main-menu-controller.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /js/controllers/main-menu-controller.js
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/controllers/main-menu-controller.js')
-rw-r--r--js/controllers/main-menu-controller.js6
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
8var Montage = require("montage/core/core").Montage, 8var 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
11exports.MainMenuController = Montage.create(Component, { 12exports.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});