Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 30 insertions, 3 deletions

diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js
index c37359e1..78065b99 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -9,9 +9,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
     addedColorChips: { value: false },
-    _penToolRadio:     { value: null, enumerable: false },
-    _penPlusRadio:   { value: null, enumerable: false },
-    _penMinusRadio:   { value: null, enumerable: false },
+
+    _penToolRadio: {
+        value: null,
+        serializable: true
+    },
+
+    _penPlusRadio: {
+        value: null,
+        serializable: true
+    },
+
+    _penMinusRadio: {
+        value: null,
+        serializable: true
+    },
 
     _subPrepare: {
         value: function() {
@@ -21,6 +33,21 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
         }
     },
 
+    _fillColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeSize: {
+        value: null,
+        serializable: true
+    },
+
     _fill: {
         enumerable: false,
         value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] }