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, 21 insertions, 8 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index b4a803b2..b496ce4a 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -57,11 +57,6 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
 
             this.eventManager.addEventListener("selectionChange", this, true);
             this.eventManager.addEventListener("elementChange", this, true);
-            this.eventManager.addEventListener("openDocument", this, true);
-
-            if(this.application.ninja.currentDocument) {
-                this.captureOpenDocument();
-            }
 
             this.addEventListener('webkitTransitionEnd', this, false);
             ['sheets', 'styles'].forEach(function(section) {
@@ -73,11 +68,29 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
             this._setUpToolbars();
         }
     },
-    captureOpenDocument : {
-        value : function(e) {
-            this.populateStyleSheetList();
+
+    _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.populateStyleSheetList();
+            }
         }
     },
+
     handleWebkitTransitionEnd : {
         value: function(e) {
             //console.log('transition end at panel base');