aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/main-menu-controller.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-22 16:26:41 -0800
committerArmen Kesablyan2012-02-22 16:26:41 -0800
commit0bd1cefea2ab350fad1a891bdc926053b799aafc (patch)
tree962f559fcc02a3dfeb297d59907e40fa153453f3 /js/controllers/main-menu-controller.js
parent695bc5082f48dddf66ce31480a4faefc067b38bd (diff)
parent2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff)
downloadninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz
Merge branch 'refs/heads/master' into new-tool-icons
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});