2 files changed, 37 insertions, 2 deletions

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 14aeae24..943594f2 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -28,11 +28,39 @@ exports.BodyController = Montage.create(ElementController, {
 
     getProperty: {
         value: function(el, p) {
+            switch(p) {
+                case "background" :
+                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true));
+                case "border":
+                    return 0;
+                case "height":
+                case "width":
+                case "-webkit-transform-style":
+                    return this.application.ninja.stylesController.getElementStyle(el, p, true, true);
+                default:
+                    return ElementController.getProperty(el, p, true, true);
+                    //console.log("Undefined Stage property ", p);
+            }
         }
     },
 
     setProperty: {
         value: function(el, p, value) {
+            switch(p) {
+                case "body-background":
+                case "background":
+                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value, true);
+                    break;
+                case "overflow":
+                case "width":
+                case "height":
+                case "-webkit-transform-style":
+                    this.application.ninja.stylesController.setElementStyle(el, p, value, true);
+                    this.application.ninja.stage.updatedStage = true;
+                    break;
+                default:
+                    console.log("Undefined property ", p, "for the Body Controller");
+            }
         }
     },
 
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 2bd774f5..a81cdf7f 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -112,12 +112,12 @@ exports.SelectionController = Montage.create(Component, {
 
     handleSelectAll: {
         value: function(event) {
-            var selected = [], childNodes = [];
+            var selected = [], childNodes = [], self = this;
 
             childNodes = this.application.ninja.currentDocument.documentRoot.childNodes;
             childNodes = Array.prototype.slice.call(childNodes, 0);
             childNodes.forEach(function(item) {
-                if(item.nodeType == 1) {
+                if(self.isNodeTraversable(item)) {
                     selected.push(item);
                 }
             });
@@ -280,6 +280,13 @@ exports.SelectionController = Montage.create(Component, {
 
             return -1;
         }
+    },
+
+    isNodeTraversable: {
+        value: function( item ) {
+            if(item.nodeType !== 1) return false;
+            return ((item.nodeName !== "STYLE") && (item.nodeName !== "SCRIPT"));
+        }
     }
 
 });