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 ++++++-- .../treeview/ninja-branch.reel/ninja-branch.js | 28 ++++++------ js/components/treeview/treeview.reel/treeview.js | 52 +++++++++++----------- 6 files changed, 98 insertions(+), 57 deletions(-) (limited to 'js/components') 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() { diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js index 48271c2d..72ef3ccd 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.js +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js @@ -9,38 +9,38 @@ var Montage = require("montage").Montage, var Branch = exports.Branch = Montage.create(TreeNode, { label: { - value: null, - serializable: true + value: null +// serializable: true }, branchList: { - value: null, - serializable: true + value: null +// serializable: true }, arrayController: { - value: null, - serializable: true + value: null +// serializable: true }, repetition:{ - value: null, - serializable: true + value: null +// serializable: true }, leafComponent: { - value: null, - serializable: true + value: null +// serializable: true }, branchComponent: { - value: null, - serializable: true + value: null +// serializable: true }, collapser: { - value: null, - serializable: true + value: null +// serializable: true }, prepareForDraw : { diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js index 03e28c93..81dacbca 100644 --- a/js/components/treeview/treeview.reel/treeview.js +++ b/js/components/treeview/treeview.reel/treeview.js @@ -14,42 +14,42 @@ exports.Treeview = Montage.create(Component, { rootBranch : { value : null }, activationEvent: { - value: null, - serializable: true + value: null +// serializable: true }, _hasBeenDeserialized: { - value: false, - enumerable: false + value: false +// enumerable: false }, branchComponent : { - value: null, - serializable: true + value: null +// serializable: true }, leafComponent : { - value: null, - serializable: true + value: null +// serializable: true }, defaultBranchComponent: { - value: null, - serializable: true + value: null +// serializable: true }, defaultLeafComponent: { - value: null, - serializable: true + value: null +// serializable: true }, scrollview: { - value: null, - serializable: true + value: null +// serializable: true }, slot: { - value: null, - serializable: true + value: null +// serializable: true }, hasTemplate: { @@ -77,18 +77,18 @@ exports.Treeview = Montage.create(Component, { rootBranch.hideLabel = !this.showRoot; rootBranch.treeView = this; -// this.slot.content = rootBranch; -// rootBranch.sourceObject = this.contentController.root; -// rootBranch.needsDraw = true; -// this.rootBranch = rootBranch; -// -// this.needsDraw = true; + this.slot.content = rootBranch; + rootBranch.sourceObject = this.contentController.root; + rootBranch.needsDraw = true; + this.rootBranch = rootBranch; + + this.needsDraw = true; } }, showRoot : { - value: null, - serializable: true + value: null +// serializable: true }, _contentController: { @@ -135,8 +135,8 @@ exports.Treeview = Montage.create(Component, { } } - }, - serializable: true + } +// serializable: true }, deserializedFromTemplate: { -- cgit v1.2.3