Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

1 files changed, 26 insertions, 4 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index c39f3a56..eed58a65 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -20,10 +20,31 @@ var Component = require("montage/ui/component").Component;
 
 var LayerStyle = exports.LayerStyle = Montage.create(Component, {
 
-    hasTemplate:{
-        value: true
+    styleContainer: {
+        value: null,
+        serializable: true
     },
-    
+
+    styleHintable: {
+        value: null,
+        serializable: true
+    },
+
+    styleProperty: {
+        value: null,
+        serializable: true
+    },
+
+    valueEditorHottext: {
+        value: null,
+        serializable: true
+    },
+
+    dtextProperty: {
+        value: null,
+        serializable: true
+    },
+
     /* === BEGIN: Models === */
         // isSelected: whether or not the style is selected
         _isSelected: {
@@ -112,7 +133,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._myHintable = newVal;
-        }
+        },
+        serializable: true
     },
     _myHintableValue : {
         value: null