Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 19 insertions, 1 deletions

diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
index 93ac3793..150f20fa 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
@@ -16,7 +16,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                     "element" : {"#" : "container"},
                     "ruleListContainer": {"@": "ruleListContainer" },
                     "computedStyleView": {"@": "computedStyleView" },
-                    "substitution": {"@": "substitution" },
                     "delegate": {"@": "stylesViewDelegate"},
                     "toolbar": {"@": "toolbar"}
                 }
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 157d99de..153e74b6 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
@@ -9,6 +9,21 @@ var Montage = require("montage/core/core").Montage,
 
 exports.StylesViewContainer = Montage.create(Component, {
 
+    ruleListContainer: {
+        value: null,
+        serializable: true
+    },
+
+    computedStyleView: {
+        value: null,
+        serializable: true
+    },
+
+    toolbar: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         value : null
     },
@@ -37,6 +52,10 @@ exports.StylesViewContainer = Montage.create(Component, {
     contentPanel : {
         value: 'rules'
     },
+    selectionName: {
+        value: null,
+        serializable: true
+    },
     _selectionNameLabelText : {
         value: null
     },