Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/data/panels-data.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 29 insertions, 5 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index d97a5413..de34c7b0 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -153,10 +153,21 @@ exports.Ninja = Montage.create(Component, {
         value: []
     },
 
-    currentSelectedContainer: {
+    _currentSelectedContainer: {
         value: null
     },
 
+    currentSelectedContainer: {
+        get: function() {
+            return this._currentSelectedContainer;
+        },
+        set: function(value) {
+            if(value !== this._currentSelectedContainer) {
+                this._currentSelectedContainer = value;
+            }
+        }
+    },
+
     templateDidLoad: {
         value: function() {
             this.ninjaVersion = window.ninjaVersion.ninja.version;
@@ -181,9 +192,10 @@ exports.Ninja = Montage.create(Component, {
 
             window.addEventListener("resize", this, false);
 
-            this.eventManager.addEventListener( "selectTool", this, false);
-            this.eventManager.addEventListener( "selectSubTool", this, false);
-            this.eventManager.addEventListener( "onOpenDocument", this, false);
+            this.eventManager.addEventListener("selectTool", this, false);
+            this.eventManager.addEventListener("selectSubTool", this, false);
+            this.eventManager.addEventListener("onOpenDocument", this, false);
+            this.eventManager.addEventListener("onSwitchDocument", this, false);
 
             this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false);
             this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false);
@@ -288,7 +300,7 @@ exports.Ninja = Montage.create(Component, {
             this.currentDocument = event.detail;
 
             if(this.currentDocument.documentRoot) {
-                this.application.ninja.currentSelectedContainer = this.currentDocument.documentRoot;
+                this.currentSelectedContainer = this.currentDocument.documentRoot;
             } else {
                 alert("The current document has not loaded yet");
                 return;
@@ -299,6 +311,18 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
+    handleOnSwitchDocument: {
+        value: function() {
+            this.currentDocument = this.documentController.activeDocument;
+
+            if(this.currentDocument.documentRoot) {
+                this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.documentRoot;
+            }
+
+            NJevent("switchDocument");
+        }
+    },
+
     executeLivePreview: {
         value: function() {
             var background, overflow, transitionStopRule;