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 --- .../brush-properties.reel/brush-properties.js | 40 ++++++++++ .../fill-properties.reel/fill-properties.js | 20 +++++ .../ink-bottle-properties.js | 65 ++++++++++++++++ .../line-properties.reel/line-properties.js | 5 +- .../object3d-properties.js | 11 ++- .../oval-properties.reel/oval-properties.js | 11 ++- .../pen-properties.reel/pen-properties.html | 4 - .../pen-properties.reel/pen-properties.js | 15 ++++ .../rect-properties.reel/rect-properties.html | 1 - .../rect-properties.reel/rect-properties.js | 20 +++-- .../selection-properties.js | 86 +++++++++++++++++++++- .../shape-properties.reel/shape-properties.html | 7 +- .../shape-properties.reel/shape-properties.js | 71 ++++++++++++++++++ .../tag-properties.reel/tag-properties.js | 26 +++++-- .../text-properties.reel/text-properties.html | 18 +---- .../text-properties.reel/text-properties.js | 44 +++++------ .../zoom-properties.reel/zoom-properties.js | 12 ++- 17 files changed, 385 insertions(+), 71 deletions(-) (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 7a0d21f1..1af128af 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js @@ -11,6 +11,46 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { addedColorChips: { value: false }, + _fillColorCtrl: { + value: null, + serializable: true + }, + + _strokeSize: { + value: null, + serializable: true + }, + + _strokeHardness: { + value: null, + serializable: true + }, + + _doSmoothing: { + value: null, + serializable: true + }, + + _smoothingAmount: { + value: null, + serializable: true + }, + + _useCalligraphic: { + value: null, + serializable: true + }, + + _strokeAngle: { + value: null, + serializable: true + }, + + _angleLabel: { + value: null, + serializable: true + }, + _fill: { enumerable: false, value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] } diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index ae136956..616badb0 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js @@ -10,6 +10,26 @@ var Montage = require("montage/core/core").Montage, var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { + _fillColorCtrl: { + value: null, + serializable: true + }, + + _useWebGL: { + value: null, + serializable: true + }, + + _materialsContainer: { + value: null, + serializable: true + }, + + _fillMaterial: { + value: null, + serializable: true + }, + _use3D: { value: false }, addedColorChips: { value: false }, diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index 945df857..8b4cc327 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js @@ -11,6 +11,71 @@ var Montage = require("montage/core/core").Montage, var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { addedColorChips: { value: false }, + _strokeColorCtrl: { + value: null, + serializable: true + }, + + useBorderWidth: { + value: null, + serializable: true + }, + + borderWidthLabel: { + value: null, + serializable: true + }, + + _borderWidth: { + value: null, + serializable: true + }, + + useBorderStyle: { + value: null, + serializable: true + }, + + borderStyleLabel: { + value: null, + serializable: true + }, + + _borderStyle: { + value: null, + serializable: true + }, + + useStrokeSize: { + value: null, + serializable: true + }, + + strokeSizeLabel: { + value: null, + serializable: true + }, + + _strokeSize: { + value: null, + serializable: true + }, + + _useWebGL: { + value: null, + serializable: true + }, + + _materialsContainer: { + value: null, + serializable: true + }, + + _strokeMaterial: { + value: null, + serializable: true + }, + _stroke: { 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] } diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js index ce8c0494..8c845432 100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.js +++ b/js/components/tools-properties/line-properties.reel/line-properties.js @@ -9,7 +9,10 @@ var Montage = require("montage/core/core").Montage, exports.LineProperties = Montage.create(ToolProperties, { - base: { value: null }, + base: { + value: null, + serializable: true + }, _subPrepare: { value: function() { diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js index d7f0976c..33ef3394 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js @@ -10,8 +10,15 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; exports.Object3DProperties = Montage.create(ToolProperties, { - rotateLocally: { value: null, enumerable: false }, - rotateGlobally: { value: null, enumerable: false }, + rotateLocally: { + value: null, + serializable: true + }, + + rotateGlobally: { + value: null, + serializable: true + }, _subPrepare: { value: function () { diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index 3edd9214..d371193f 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js @@ -8,8 +8,15 @@ var Montage = require("montage/core/core").Montage, ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; exports.OvalProperties = Montage.create(ToolProperties, { - base: { value: null }, - innerRadius: { value: null }, + base: { + value: null, + serializable: true + }, + + innerRadius: { + value: null, + serializable: true + }, _subPrepare: { value: function() { 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] } 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}, diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.js b/js/components/tools-properties/selection-properties.reel/selection-properties.js index 43622960..c036c4a3 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.js +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.js @@ -10,7 +10,91 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T exports.SelectionProperties = Montage.create(ToolProperties, { - transform: { value: null }, + transform: { + value: null, + serializable: true + }, + + topAlign: { + value: null, + serializable: true + }, + + middleAlign: { + value: null, + serializable: true + }, + + bottomAlign: { + value: null, + serializable: true + }, + + leftAlign: { + value: null, + serializable: true + }, + + centerAlign: { + value: null, + serializable: true + }, + + rightAlign: { + value: null, + serializable: true + }, + + distTop: { + value: null, + serializable: true + }, + + distMiddle: { + value: null, + serializable: true + }, + + distBottom: { + value: null, + serializable: true + }, + + distLeft: { + value: null, + serializable: true + }, + + distCenter: { + value: null, + serializable: true + }, + + distRight: { + value: null, + serializable: true + }, + + arrangeBringForward: { + value: null, + serializable: true + }, + + arrangeSendBackward: { + value: null, + serializable: true + }, + + arrangeBringToFront: { + value: null, + serializable: true + }, + + arrangeSendToBack: { + value: null, + serializable: true + }, + _controls: { value: false }, _subPrepare: { diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 9b523a3f..ea246ea8 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -118,12 +118,7 @@ "rectProperties": {"@": "rectProperties1"}, "lineProperties": {"@": "lineProperties1"}, - "endDivider": {"#": "endDivider"}, - - "components": [ - {"@": "repetition1"} - ] - + "endDivider": {"#": "endDivider"} } } diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js index bd0cf8cf..5829634c 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js @@ -10,6 +10,77 @@ var Montage = require("montage/core/core").Montage, var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { toolsData: { value: null }, + + _strokeMaterial: { + value: null, + serializable: true + }, + + _fillIcon: { + value: null, + serializable: true + }, + + _fillMaterial: { + value: null, + serializable: true + }, + + _useWebGL: { + value: null, + serializable: true + }, + + _materialLabel: { + value: null, + serializable: true + }, + + _strokeIcon: { + value: null, + serializable: true + }, + + _fillColorCtrlIcon: { + value: null, + serializable: true + }, + + _fillColorCtrl: { + value: null, + serializable: true + }, + + _strokeColorCtrl: { + value: null, + serializable: true + }, + + _strokeSize: { + value: null, + serializable: true + }, + + ovalProperties: { + value: null, + serializable: true + }, + + rectProperties: { + value: null, + serializable: true + }, + + lineProperties: { + value: null, + serializable: true + }, + + endDivider: { + value: null, + serializable: true + }, + _use3D: { value: false }, addedColorChips: { value: false }, diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index 52c6f44c..d38419aa 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js @@ -9,16 +9,26 @@ var Component = require("montage/ui/component").Component; var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { - divElement: { value: null, enumerable: false }, - imageElement: { value: null, enumerable: false }, - videoElement: { value: null, enumerable: false }, - canvasElement: { value: null, enumerable: false }, - customElement: { value: null, enumerable: false }, - classField: { value: null, enumerable: false }, - customName: { value: null, enumerable: false }, - customLabel: { value: null, enumerable: false }, + divElement: { + value: null, + serializable: true + }, + + imageElement: { value: null, serializable: true }, + videoElement: { value: null, serializable: true }, + canvasElement: { value: null, serializable: true }, + customElement: { value: null, serializable: true }, + classField: { value: null, serializable: true }, + customName: { value: null, serializable: true }, + customLabel: { value: null, serializable: true }, + addedColorChips: { value: false }, + _fillColorCtrl: { + value: null, + serializable: true + }, + _fill: { enumerable: false, value: { colorMode: 'nocolor', color: null, webGlColor: null } diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 725e1d22..e7fafd0d 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html @@ -89,7 +89,6 @@ "properties": { "element": {"#": "btnBold"}, "pressedClass": "active", - "preventFocus": true, "identifier": "btnBold", "pressedLabel": "B", "unpressedLabel": "B" @@ -106,7 +105,6 @@ "properties": { "element": {"#": "btnItalic"}, "pressedClass": "active", - "preventFocus": true, "identifier": "btnItalic", "pressedLabel": "I", "unpressedLabel": "I" @@ -123,7 +121,6 @@ "properties": { "element": {"#": "btnUnderline"}, "pressedClass": "active", - "preventFocus": true, "identifier": "btnUnderline", "pressedLabel": "U", "unpressedLabel": "U" @@ -140,7 +137,6 @@ "properties": { "element": {"#": "btnStrikethrough"}, "pressedClass": "active", - "preventFocus": true, "identifier": "btnStrikethrough", "pressedLabel": "S", "unpressedLabel": "S" @@ -158,7 +154,6 @@ "properties": { "element": {"#": "alignLeft"}, "pressedClass": "active", - "preventFocus": true, "identifier": "alignLeft", "pressedLabel": "", "unpressedLabel": "" @@ -175,7 +170,6 @@ "properties": { "element": {"#": "alignCenter"}, "pressedClass": "active", - "preventFocus": true, "identifier": "alignCenter", "pressedLabel": "", "unpressedLabel": "" @@ -192,7 +186,6 @@ "properties": { "element": {"#": "alignRight"}, "pressedClass": "active", - "preventFocus": true, "identifier": "alignRight", "pressedLabel": "", "unpressedLabel": "" @@ -209,7 +202,6 @@ "properties": { "element": {"#": "alignJustify"}, "pressedClass": "active", - "preventFocus": true, "identifier": "alignJustify", "pressedLabel": "", "unpressedLabel": "" @@ -225,10 +217,8 @@ "prototype": "montage/ui/button.reel", "properties": { "element": {"#": "indent"}, - "pressedClass": "active", - "preventFocus": true, "identifier": "indent", - "label": ">>" + "value": ">>" }, "listeners": [ { @@ -241,10 +231,8 @@ "prototype": "montage/ui/button.reel", "properties": { "element": {"#": "outdent"}, - "pressedClass": "active", - "preventFocus": true, "identifier": "outdent", - "label": "<<" + "value": "<<" }, "listeners": [ { @@ -258,7 +246,6 @@ "properties": { "element": {"#": "bulletedList"}, "pressedClass": "active", - "preventFocus": true, "identifier": "bulletedList", "pressedLabel": "• • •", "unpressedLabel": "• • •" @@ -275,7 +262,6 @@ "properties": { "element": {"#": "numberedList"}, "pressedClass": "active", - "preventFocus": true, "identifier": "numberedList", "pressedLabel": "1 2 3", "unpressedLabel": "1 2 3" diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js index fa2ec066..7fe5537c 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.js +++ b/js/components/tools-properties/text-properties.reel/text-properties.js @@ -10,28 +10,28 @@ var ArrayController = require("montage/ui/controller/array-controller").ArrayCon var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; exports.TextProperties = Montage.create(ToolProperties, { - className: {value: null}, - tagType: {value: null}, - fontSelection: {value: null}, - fontSettings: {value: null}, - fontSize: {value: null}, - fontColor: {value: null}, - btnBold: {value: null}, - btnItalic: {value: null}, - btnUnderline: {value: null}, - btnStrikethrough: {value: null}, - txtLink: {value: null}, - linkTarget: {value: null}, - alignLeft: {value: null}, - alignCenter: {value: null}, - alignRight: {value: null}, - alignJustify: {value: null}, - indent: {value: null}, - outdent: {value: null}, - numberedList: {value: null}, - bulletedList: {value: null}, - fontTypes: {value: null}, - fontSizes: {value: null}, + className: {value: null, serializable: true}, + tagType: {value: null, serializable: true}, + fontSelection: {value: null, serializable: true}, + fontSettings: {value: null, serializable: true}, + fontSize: {value: null, serializable: true}, + fontColor: {value: null, serializable: true}, + btnBold: {value: null, serializable: true}, + btnItalic: {value: null, serializable: true}, + btnUnderline: {value: null, serializable: true}, + btnStrikethrough: {value: null, serializable: true}, + txtLink: {value: null, serializable: true}, + linkTarget: {value: null, serializable: true}, + alignLeft: {value: null, serializable: true}, + alignCenter: {value: null, serializable: true}, + alignRight: {value: null, serializable: true}, + alignJustify: {value: null, serializable: true}, + indent: {value: null, serializable: true}, + outdent: {value: null, serializable: true}, + numberedList: {value: null, serializable: true}, + bulletedList: {value: null, serializable: true}, + fontTypes: {value: null, serializable: true}, + fontSizes: {value: null, serializable: true}, prepareForDraw: { value: function() { diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js index b8d6eb6b..020e238c 100755 --- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js +++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js @@ -10,8 +10,16 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T exports.ZoomProperties = Montage.create(ToolProperties, { - zoomIn: { value: null }, - zoomOut: { value: null }, + zoomIn: { + value: null, + serializable: true + }, + + zoomOut: { + value: null, + serializable: true + }, + zoomInCursor:{value:"url('images/cursors/zoom.png'), default"}, zoomOutCursor:{value:"url('images/cursors/zoom_minus.png'), default"}, _subPrepare: { -- cgit v1.2.3 From dc503d002be8fe5f12fd3cc6f848b3190c219659 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 11 Jun 2012 23:22:20 -0700 Subject: removing serializable to the tree and adding a few more missing properties Signed-off-by: Valerio Virgillito --- .../fill-properties.reel/fill-properties.js | 25 ++++++++++++++++++++++ .../ink-bottle-properties.js | 24 ++++++++++----------- .../pen-properties.reel/pen-properties.html | 8 +++++-- .../pen-properties.reel/pen-properties.js | 18 +++++++++++++--- 4 files changed, 58 insertions(+), 17 deletions(-) (limited to 'js/components/tools-properties') diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index 7331b375..ef1699af 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js @@ -10,6 +10,31 @@ var Montage = require("montage/core/core").Montage, var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { + useFillColor: { + value: null, + serializable: true + }, + + _fillColorCtrl: { + value: null, + serializable: true + }, + + useWebGL: { + value: null, + serializable: true + }, + + _materialsContainer: { + value: null, + serializable: true + }, + + fillMaterial: { + value: null, + serializable: true + }, + addedColorChips: { value: false }, _fill: { diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index e52da410..25823d11 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js @@ -11,22 +11,22 @@ var Montage = require("montage/core/core").Montage, var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { addedColorChips: { value: false }, - _strokeColorCtrl: { + useStrokeColor: { value: null, serializable: true }, - useBorderWidth: { + _strokeColorCtrl: { value: null, serializable: true }, - borderWidthLabel: { + borderWidth: { value: null, serializable: true }, - _borderWidth: { + useBorderWidth: { value: null, serializable: true }, @@ -36,42 +36,42 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope serializable: true }, - borderStyleLabel: { + borderStyle: { value: null, serializable: true }, - _borderStyle: { + useStrokeSize: { value: null, serializable: true }, - useStrokeSize: { + strokeSize: { value: null, serializable: true }, - strokeSizeLabel: { + _useWebGL: { value: null, serializable: true }, - _strokeSize: { + useWebGL: { value: null, serializable: true }, - _useWebGL: { + _materialsContainer: { value: null, serializable: true }, - _materialsContainer: { + _strokeMaterial: { value: null, serializable: true }, - _strokeMaterial: { + strokeMaterial: { value: null, serializable: true }, 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 4ea6aac4..adb5cd7d 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -29,14 +29,18 @@ "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 5ae03adc..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() { -- cgit v1.2.3