1 files changed, 35 insertions, 26 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 75bffc5c..db8bdf51 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -20,6 +20,41 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
+    _currentDocument: {
+        value : null,
+        enumerable : false
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+
+            if(this._currentDocument.currentView === "design") {
+
+                /*
+                this._isDocument = true;
+
+                if(currentSelectionArray) {
+                    this.application.ninja.selectedElements = currentSelectionArray;
+                    if(currentSelectionArray.length) {
+                        this._isDocument = false;
+                        NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
+                    }
+                }
+
+                this._selectionContainer = this.application.ninja.currentSelectedContainer;
+                */
+            }
+        }
+    },
+
     /*
      * Bound property to the ninja currentSelectedContainer
      */
@@ -52,32 +87,6 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    /**
-     * Get the current document selection array. If nothing is selected the currentSelectionArray should be null
-     */
-    handleOpenDocument: {
-        value: function() {
-            // Handle initializing the selection array here.
-            this.initWithDocument([]);
-        }
-    },
-    
-    initWithDocument: {
-        value: function(currentSelectionArray) {
-            this._isDocument = true;
-
-            if(currentSelectionArray) {
-                this.application.ninja.selectedElements = currentSelectionArray;
-                if(currentSelectionArray.length) {
-                    this._isDocument = false;
-                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
-                }
-            }
-
-            this._selectionContainer = this.application.ninja.currentSelectedContainer;
-        }
-    },
-
     handleSwitchDocument: {
         value: function() {
 //            if(this.application.ninja.documentController.activeDocument.currentView === "design"){