Merge branch 'refs/heads/master' into new-tool-icons

19 files changed, 28 insertions, 16 deletions

diff --git a/js/panels/properties/content.reel/content.css b/js/panels/properties/content.reel/content.css
index 2537aea2..2537aea2 100644..100755
--- a/js/panels/properties/content.reel/content.css
+++ b/js/panels/properties/content.reel/content.css
diff --git a/js/panels/properties/content.reel/content.html b/js/panels/properties/content.reel/content.html
index ab485323..ab485323 100644..100755
--- a/js/panels/properties/content.reel/content.html
+++ b/js/panels/properties/content.reel/content.html
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 1ec6d769..53926c78 100644..100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -54,8 +54,17 @@ exports.Content = Montage.create(Component, {
                 this.eventManager.addEventListener( "elementChanging", this, false);
             }
 
+            this.eventManager.addEventListener("openDocument", this, false);
+        }
+    },
+
+    // Document is opened - Display the current selection
+    handleOpenDocument: {
+        value: function() {
+
             this.eventManager.addEventListener( "elementChange", this, false);
 
+            // For now always assume that the stage is selected by default
             if(this.application.ninja.selectedElements.length === 0) {
                 this.displayStageProperties();
             }
diff --git a/js/panels/properties/properties-panel.js b/js/panels/properties/properties-panel.js
index 31bc4919..31bc4919 100644..100755
--- a/js/panels/properties/properties-panel.js
+++ b/js/panels/properties/properties-panel.js
diff --git a/js/panels/properties/section.reel/section.html b/js/panels/properties/section.reel/section.html
index 8a331119..8a331119 100644..100755
--- a/js/panels/properties/section.reel/section.html
+++ b/js/panels/properties/section.reel/section.html
diff --git a/js/panels/properties/section.reel/section.js b/js/panels/properties/section.reel/section.js
index b246c171..b246c171 100644..100755
--- a/js/panels/properties/section.reel/section.js
+++ b/js/panels/properties/section.reel/section.js
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
index 9c2588b9..9c2588b9 100644..100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
index 60f8efef..60f8efef 100644..100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
diff --git a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
index 0398ff4c..0398ff4c 100644..100755
--- a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.html
diff --git a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
index 72d216ca..72d216ca 100644..100755
--- a/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
+++ b/js/panels/properties/sections/custom-rows/dual-row.reel/dual-row.js
diff --git a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
index 27c02380..27c02380 100644..100755
--- a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
+++ b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.html
diff --git a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
index b606d6b8..b606d6b8 100644..100755
--- a/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
+++ b/js/panels/properties/sections/custom-rows/single-row.reel/single-row.js
diff --git a/js/panels/properties/sections/custom.reel/custom.html b/js/panels/properties/sections/custom.reel/custom.html
index 6d4cf0cd..6d4cf0cd 100644..100755
--- a/js/panels/properties/sections/custom.reel/custom.html
+++ b/js/panels/properties/sections/custom.reel/custom.html
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js
index a2b9b9fa..a2b9b9fa 100644..100755
--- a/js/panels/properties/sections/custom.reel/custom.js
+++ b/js/panels/properties/sections/custom.reel/custom.js
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.css b/js/panels/properties/sections/position-and-size.reel/position-and-size.css
index 227a232b..227a232b 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.css
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.css
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.html b/js/panels/properties/sections/position-and-size.reel/position-and-size.html
index 79a55385..79a55385 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.html
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.html
diff --git a/js/panels/properties/sections/position-and-size.reel/position-and-size.js b/js/panels/properties/sections/position-and-size.reel/position-and-size.js
index 49117090..49117090 100644..100755
--- a/js/panels/properties/sections/position-and-size.reel/position-and-size.js
+++ b/js/panels/properties/sections/position-and-size.reel/position-and-size.js
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
index 1e24cb55..1e24cb55 100644..100755
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
index 0c4a9171..35591afa 100644..100755
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
@@ -207,29 +207,32 @@ exports.ThreeD = Montage.create(Component, {
     templateDidLoad : {
         value: function() {
             Object.defineBinding(this, "axisMode", {
-                            boundObject: this.axisModeGroupControl,
-                            boundObjectPropertyPath: "selectedIndex",
-                            oneway: false
-                        });
+                boundObject: this.axisModeGroupControl,
+                boundObjectPropertyPath: "selectedIndex",
+                oneway: false
+            });
+
+            this.eventManager.addEventListener("openDocument", this, false);
+        }
+    },
+
+    handleOpenDocument: {
+        value: function() {
 
             Object.defineBinding(this, "item", {
-                    boundObject: this,
-                    boundObjectPropertyPath: "application.ninja.selectedElements",
-                    boundValueMutator: this._getSelectedItem,
-                    oneway: true
-                });
+                boundObject: this,
+                boundObjectPropertyPath: "application.ninja.selectedElements",
+                boundValueMutator: this._getSelectedItem,
+                oneway: true
+            });
         }
     },
 
     _getSelectedItem: {
-        value: function(els)
-        {
-            if(els.length)
-            {
+        value: function(els) {
+            if(els.length) {
                 return els[0]._element || els[0];
-            }
-            else
-            {
+            } else {
                 return this.boundObject.application.ninja.currentDocument.documentRoot;
             }
         }