diff options
author | Valerio Virgillito | 2012-02-14 13:11:19 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-14 13:11:19 -0800 |
commit | 3eb735bdc9016b889e9066be680ebd9fbc0c60c0 (patch) | |
tree | 3119aa07bdde5aecc3af2d29ff67b83c48601e10 /js/controllers | |
parent | df898049b2990f456a305eb18434b887468225cf (diff) | |
parent | 997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff) | |
download | ninja-3eb735bdc9016b889e9066be680ebd9fbc0c60c0.tar.gz |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/controllers')
-rw-r--r-- | js/controllers/elements/stage-controller.js | 4 | ||||
-rw-r--r-- | js/controllers/main-menu-controller.js | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index af7c4858..a8546662 100644 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -92,7 +92,11 @@ exports.StageController = Montage.create(ElementController, { | |||
92 | 92 | ||
93 | setProperty: { | 93 | setProperty: { |
94 | value: function(el, p, value) { | 94 | value: function(el, p, value) { |
95 | |||
95 | switch(p) { | 96 | switch(p) { |
97 | case "body-background": | ||
98 | el.elementModel.body.style.setProperty("background", value); | ||
99 | break; | ||
96 | case "background": | 100 | case "background": |
97 | el.elementModel.stageBackground.style.setProperty(p, value); | 101 | el.elementModel.stageBackground.style.setProperty(p, value); |
98 | break; | 102 | break; |
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 | }); |