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, 14 insertions, 7 deletions

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index a7bf6a7c..41606a45 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -80,7 +80,6 @@
                     "element": {"#": "lockButton"},
                     "pressed": true,
                     "pressedClass": "lockUp",
-                    "preventFocus": true,
                     "identifier": "lockButton"
                 },
                 "listeners": [
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index 2f8ea4dd..94c674a2 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -8,12 +8,20 @@ var Montage = require("montage/core/core").Montage,
     ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 
 exports.RectProperties = Montage.create(ToolProperties, {
-    base:       { value: null },
-    lockButton: { value: null, enumerable: false},
-    TLRadiusControl: { value: null, enumerable: false },
-    TRRadiusControl: { value: null, enumerable: false },
-    BLRadiusControl: { value: null, enumerable: false },
-    BRRadiusControl: { value: null, enumerable: false },
+    base: {
+        value: null,
+        serializable: true
+    },
+
+    lockButton: {
+        value: null,
+        serializable: true
+    },
+
+    TLRadiusControl: { value: null, serializable: true },
+    TRRadiusControl: { value: null, serializable: true },
+    BLRadiusControl: { value: null, serializable: true },
+    BRRadiusControl: { value: null, serializable: true },
 
     _unlocked: { value: false, enumerable: false},