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>

1 files changed, 44 insertions, 20 deletions

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 = "";