From be18a677863925963551ce3e88a4a4d254f3870c Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 14 Feb 2012 09:26:18 -0800
Subject: Implemented about box component and hooked it up to the About menu

---
 js/controllers/main-menu-controller.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/controllers')

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
 
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    AboutBoxPopup = require("js/components/about-box.reel").AboutBox;
 
 exports.MainMenuController = Montage.create(Component, {
     deserializedFromTemplate:{
@@ -36,8 +37,7 @@ exports.MainMenuController = Montage.create(Component, {
     },
     handleExecuteHelpAbout:{
         value:function () {
-            // TODO
-            console.log("Pull up the about popup");
+            AboutBoxPopup.show();
         }
     }
 });
-- 
cgit v1.2.3


From 08101852de934ed674807b26ab89f432daa4d6fe Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 14 Feb 2012 12:01:57 -0800
Subject: Fixing the live preview background issue.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/elements/stage-controller.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/controllers')

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, {
 
     setProperty: {
         value: function(el, p, value) {
+
             switch(p) {
+                case "body-background":
+                    el.elementModel.body.style.setProperty("background", value);
+                    break;
                 case "background":
                     el.elementModel.stageBackground.style.setProperty(p, value);
                     break;
-- 
cgit v1.2.3