Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

2 files changed, 22 insertions, 1 deletions

diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html
index 00cebf39..0f16b3d8 100644
--- a/js/panels/css-panel/css-style.reel/css-style.html
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                     "checked": true
                 },
                 "bindings": {
-                    "checked" : {"<<->": "@owner.enabled" }
+                    "checked" : {"<->": "@owner.enabled" }
                 }
             },
             "property": {
diff --git a/js/panels/css-panel/css-style.reel/css-style.js b/js/panels/css-panel/css-style.reel/css-style.js
index 84841f5b..294d49a9 100644
--- a/js/panels/css-panel/css-style.reel/css-style.js
+++ b/js/panels/css-panel/css-style.reel/css-style.js
@@ -8,6 +8,27 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.CssStyle = Montage.create(Component, {
+    declaration: {
+        value: null
+    },
+
+    addStyleButton: {
+        value: null,
+        serializable: true
+    },
+
+    propertyField: {
+        value: null
+    },
+
+    valueField: {
+        value: null
+    },
+
+    propertyNames: {
+        value: null
+    },
+
     delegate          : { value: null },
     disabledClass     : { value: 'style-item-disabled' },
     editingStyleClass : { value: 'edit-style-item' },