Merge branch 'master' of github.com:Motorola-Mobility/ninja

3 files changed, 13 insertions, 182 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 1fc1ba12..1351921b 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -34,57 +34,6 @@ var Montage = require("montage/core/core").Montage,
 
 exports.AppModel = Montage.create(Component, {
 
-    _currentDocument: {
-        value : null
-    },
-
-    currentDocument : {
-        get : function() {
-            return this._currentDocument;
-        },
-        set : function(value) {
-            if (value === this._currentDocument) {
-                return;
-            }
-
-            if(this._currentDocument && this._currentDocument.currentView === "design") {
-                this._currentDocument.model.draw3DGrid = this.show3dGrid;
-            }
-
-            this._currentDocument = value;
-
-            if(this._currentDocument && this._currentDocument.currentView === "design") {
-                this.show3dGrid = this._currentDocument.model.draw3DGrid;
-            }
-
-        }
-    },
-
-    _livePreview: {
-        value: false
-    },
-
-    livePreview: {
-        get: function() {
-            return this._livePreview;
-        },
-        set: function(value) {
-            this._livePreview = value;
-        }
-    },
-    _chromePreview: {
-        value: false
-    },
-
-    chromePreview: {
-        get: function() {
-            return this._chromePreview;
-        },
-        set: function(value) {
-            this._chromePreview = value;
-        }
-    },
-
     _layoutView: {
         value: "layoutAll"
     },
@@ -98,67 +47,6 @@ exports.AppModel = Montage.create(Component, {
         }
     },
 
-    _layoutAll: {
-        value: true
-    },
-
-    layoutAll: {
-        get: function() {
-            return this._layoutAll;
-        },
-        set: function(value) {
-
-            if(value) {
-                this.layoutView = "layoutAll";
-                this.layoutItems = false;
-                this.layoutOff = false;
-            }
-
-            this._layoutAll = value;
-
-        }
-    },
-
-    _layoutItems: {
-        value: false
-    },
-
-    layoutItems: {
-        get: function() {
-            return this._layoutItems;
-        },
-        set: function(value) {
-
-            if(value) {
-                this.layoutView = "layoutItems";
-                this.layoutAll = false;
-                this.layoutOff = false;
-            }
-
-            this._layoutItems = value;
-        }
-    },
-
-    _layoutOff: {
-        value: false
-    },
-
-    layoutOff: {
-        get: function() {
-            return this._layoutOff;
-        },
-        set: function(value) {
-
-            if(value) {
-                this.layoutView = "layoutOff";
-                this.layoutAll = false;
-                this.layoutItems = false;
-            }
-
-            this._layoutOff = value;
-        }
-    },
-
     _snap: {
         value: true
     },
@@ -237,63 +125,6 @@ exports.AppModel = Montage.create(Component, {
         }
     },
 
-    _frontStageView: {
-        value: true
-    },
-
-    frontStageView: {
-        get: function() {
-            return this._frontStageView;
-        },
-        set: function(value) {
-            if(value) {
-                this.documentStageView = "front";
-                this.topStageView = false;
-                this.sideStageView = false;
-            }
-
-            this._frontStageView = value;
-        }
-    },
-
-    _topStageView: {
-        value: false
-    },
-
-    topStageView: {
-        get: function() {
-            return this._topStageView;
-        },
-        set: function(value) {
-            if(value) {
-                this.documentStageView = "top";
-                this.frontStageView = false;
-                this.sideStageView = false;
-            }
-
-            this._topStageView = value;
-        }
-    },
-
-    _sideStageView: {
-        value: false
-    },
-
-    sideStageView: {
-        get: function() {
-            return this._sideStageView;
-        },
-        set: function(value) {
-            if(value) {
-                this.documentStageView = "side";
-                this.frontStageView = false;
-                this.topStageView = false;
-            }
-
-            this._sideStageView = value;
-        }
-    },
-
     _debug: {
         value: true
     },
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 07abbd40..7d8e6ebb 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -53,7 +53,7 @@ var modelGenerator = exports.modelGenerator = function() {
         })
     });
 
-    if(this._model.selection !== "body") {
+    if(this._model.selection !== "body" && this.nodeName.toLowerCase() !== "ninja-content") {
         this._model.props3D.init(this, false);
     }
 
@@ -75,9 +75,9 @@ var getInfoForElement = function(el) {
     }
 
     if(el.nodeName.toLowerCase() === "ninja-content") {
-        elementName = "body";
-        controller = elementNameToController(elementName);
-        pi = elementNameToPi(elementName);
+        elementName = "div";
+        controller = elementNameToController("body");
+        pi = elementNameToPi("body");
     }
 
     // TODO: Add this in case there is no controller for the component
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index cc3c3fa1..ec481933 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
 var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
 var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
 //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
-//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
-//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
+var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
+var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial;
 var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
@@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
 //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
 //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;