Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 13 insertions, 13 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bbccf45d..bd10f7a5 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -214,10 +214,9 @@ exports.MaterialsPopup = Montage.create(Component, {
                 enumerable: true,
                 value: function(materialID)
                 {
-            // Note that setting Array.length = 0 will empty arrays,
-            // which is fine if you use getMaterialData to get a new array, but not for the
-            // dummyData arrays.
-            this._materialsData.length = 0;
+            //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
+            this.materialsData = [];
+
             this._materialName = materialID;
             if(
                                         (materialID ===  "UberMaterial")                                ||
@@ -231,16 +230,14 @@ exports.MaterialsPopup = Montage.create(Component, {
                                 if (material)
                                 {
                                         this._material = material;
-                                        var matData = this.getMaterialData( material );
-                                        this.materialsData = matData;
+                    this.materialsData = this.getMaterialData( material );
                                 }
             }
             else
             {
-                this.materialsData = this._dummyData1.slice(0);
+                this.materialsData = this[materialID];
             }
-            
-           this.needsDraw = true;
+            this.needsDraw = true;
                 }
         },
 
@@ -445,7 +442,8 @@ exports.MaterialsPopup = Montage.create(Component, {
                 }
         },
 
-    _dummyData1: {
+    // _dummyData1
+    CheckerBoard: {
         value: [
             {
                 "label":         "Texture1",
@@ -588,7 +586,8 @@ exports.MaterialsPopup = Montage.create(Component, {
         ]
     },
 
-    _dummyData2: {
+    // _dummyData2
+    ShinyMetal: {
         value: [
                     {
                         "label":         "Diffuse",
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index d9dca538..b21014c1 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -73,8 +73,9 @@ exports.Properties = Montage.create(Component, {
 
             this.eventManager.addEventListener( "elementChange", this, false);
 
-            // For now always assume that the stage is selected by default
-            if(this.application.ninja.selectedElements.length === 0) {
+            // For now always assume that the stage is selected by default when opening the old template
+            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
+            if(this.application.ninja.selectedElements.length === 0 && this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() !== "body") {
                 this.displayStageProperties();
             }
         }