Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

3 files changed, 92 insertions, 72 deletions

diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index ac0dab5a..b9aa206b 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -56,7 +56,10 @@
                 }
             },
             "threeDProperties": {
-                "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]"
+                "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
+                }
             },
 
             "CustomSections": {
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 7f8197ea..d3362474 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -13,6 +13,35 @@ var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.Properties = Montage.create(Component, {
 
+    _currentDocument: {
+        value : null
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+
+//            if(!value) {
+                this.clear();
+//            }
+
+            /*
+            else if(this._currentDocument.currentView === "design") {
+                // Display the default document root PI
+                //this.displayElementProperties(this._currentDocument.model.documentRoot);
+//                this.displaySelection(this._currentDocument.model.selection);
+            }
+            */
+        }
+    },
+
     elementName: {
         value: null
     },
@@ -46,9 +75,8 @@ exports.Properties = Montage.create(Component, {
 
     prepareForDraw: {
         value : function() {
-            this.eventManager.addEventListener("openDocument", this, false);
+            this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("selectionChange", this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
 
             // This will be a toggle option
             if(this.application.ninja.appData.PILiveUpdate) {
@@ -65,24 +93,6 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
-    handleOpenDocument: {
-        value: function() {
-            this.eventManager.addEventListener( "elementChange", this, false);
-
-            // Save a reference of the pi inside the document view to be able to clear
-            this.application.ninja.currentDocument.model.views.design.propertiesPanel = this;
-
-            // Display the default document root PI
-            this.displayElementProperties(this.application.ninja.currentDocument.model.documentRoot);
-        }
-    },
-
-    handleCloseDocument: {
-        value: function(){
-            this.clear();
-        }
-    },
-
     /**
      * Blur and Key up to handle change in the Element ID field.
      */
@@ -174,6 +184,20 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
+    displaySelection: {
+        value: function(selection) {
+            if(selection.length === 0) {
+                this.displayElementProperties(this._currentDocument.model.documentRoot);
+            } else {
+                if(selection.length === 1) {
+                    this.displayElementProperties(this.application.ninja.selectedElements[0]);
+                } else {
+                    this.displayGroupProperties(this.application.ninja.selectedElements);
+                }
+            }
+        }
+    },
+
     clear: {
         value: function() {
             this.elementName.value = "";
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index e16e3509..104d474d 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -26,8 +26,7 @@ exports.ThreeD = Montage.create(Component, {
         set: function(value) {
             this._axisMode = value;
             
-            if(value === 0)
-            {
+            if(value === 0) {
                 this.inGlobalMode = false;
                 this.x3D = 0;
                 this.y3D = 0;
@@ -36,13 +35,10 @@ exports.ThreeD = Montage.create(Component, {
                 this.xAngle = 0;
                 this.yAngle = 0;
                 this.zAngle = 0;
-            }
-            else
-            {
+            } else {
                 this.inGlobalMode = true;
                 var item = this.item;
-                if(item)
-                {
+                if(item) {
                     this.x3D = item.elementModel.props3D.x3D;
                     this.y3D = item.elementModel.props3D.y3D;
                     this.z3D = item.elementModel.props3D.z3D;
@@ -114,8 +110,7 @@ exports.ThreeD = Montage.create(Component, {
     handleAction: {
         value: function(event) {
             if(event.currentTarget.identifier === "flatten") {
-                this.application.ninja.elementMediator.setProperty([this.item],
-                                                                    "-webkit-transform-style",
+                this.application.ninja.elementMediator.setProperty([this.item], "-webkit-transform-style",
                                                                     event.currentTarget.checked ? ["flat"] : ["preserve-3d"]);
             }
         }
@@ -127,11 +122,7 @@ exports.ThreeD = Montage.create(Component, {
                 return;
             }
 
-            this.apply3DProperties(event.currentTarget.identifier,
-                                    event.currentTarget,
-                                    this.item,
-                                    this.inGlobalMode,
-                                    false);
+            this.apply3DProperties(event.currentTarget.identifier, event.currentTarget, this.item, this.inGlobalMode, false);
 
             this._curMat = null;
             this._curProp = null;
@@ -144,28 +135,24 @@ exports.ThreeD = Montage.create(Component, {
                 return;
             }
 
-            this.apply3DProperties(event.currentTarget.identifier,
-                            event.currentTarget,
-                            this.item,
-                            this.inGlobalMode,
-                            true);
+            this.apply3DProperties(event.currentTarget.identifier, event.currentTarget, this.item, this.inGlobalMode, true);
         }
     },
 
     apply3DProperties : {
         value : function(prop, value, item, inGlobalMode, isChanging){
-            if(!this._curMat)
-            {
+            if(!this._curMat) {
                 this._curMat = this.application.ninja.elementMediator.getMatrix(item);
             }
+