From 0e1a276f19ea70009c5a649e9667861d7c346a7e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 6 Jun 2012 00:25:27 -0700 Subject: first iteration of adding serializable to ninja plus other changes to run the latest montage Signed-off-by: Valerio Virgillito --- .../pen-properties.reel/pen-properties.html | 4 ---- .../pen-properties.reel/pen-properties.js | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'js/components/tools-properties/pen-properties.reel') diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index e720eb84..4ea6aac4 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -29,10 +29,6 @@ "properties": { "element": {"#": "penProperties"}, - "_penToolRadio": {"#": "penTool"}, - "_penPlusRadio": {"#": "penPlus"}, - "_penMinusRadio": {"#": "penMinus"}, - "_fillColorCtrl": {"#": "fillColorCtrl"}, "_strokeColorCtrl": {"#": "strokeColorCtrl"}, "_strokeSize": {"@": "strokeSizeHT"} 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 cd205e07..2bb4d3e9 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js @@ -10,6 +10,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { addedColorChips: { value: false }, + _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] } -- cgit v1.2.3