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 <valerio@motorola.com>
---
.../ink-bottle-properties.js | 65 ++++++++++++++++++++++
1 file changed, 65 insertions(+)
(limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js')
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] }
--
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 <valerio@motorola.com>
---
.../ink-bottle-properties.js | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js')
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
},
--
cgit v1.2.3