Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 23 insertions, 8 deletions

diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
index 4a391421..157d99de 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
@@ -8,6 +8,29 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.StylesViewContainer = 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.hasStyles = false;
+                this.needsDraw = true;
+            }
+        }
+    },
+
     contentController : {
         value: null
     },
@@ -74,7 +97,6 @@ exports.StylesViewContainer = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener('styleSheetsReady', this, false);
             this.eventManager.addEventListener('elementChange', this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
         }
     },
     handleStyleSheetsReady: {
@@ -150,13 +172,6 @@ exports.StylesViewContainer = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument: {
-        value: function(e) {
-            this.hasStyles = false;
-            this.needsDraw = true;
-        }
-    },
-
     draw : {
         value: function() {
             if(this.hasStyles) {