aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authormayhewinator2012-02-14 10:53:56 -0800
committermayhewinator2012-02-14 10:53:56 -0800
commitf766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (patch)
tree6113587f513fe191fb3538bdce1dc4874e583c93 /js/controllers
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
parent65cb57d19c7ff0a8b143c40caa4a227b9e7fd87b (diff)
downloadninja-f766cc203f30ea43ae8b83cf4b65d45cc4435ee9.tar.gz
Merge pull request #40 from mayhewinator/WorkingBranch
Implemented about box dialog
Diffstat (limited to 'js/controllers')
-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});