diff options
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.js')
-rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.js | 39 |
1 files changed, 3 insertions, 36 deletions
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 616badb0..7331b375 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
@@ -10,27 +10,6 @@ var Montage = require("montage/core/core").Montage, | |||
10 | 10 | ||
11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | 11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { |
12 | 12 | ||
13 | _fillColorCtrl: { | ||
14 | value: null, | ||
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | _useWebGL: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | _materialsContainer: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | _fillMaterial: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | _use3D: { value: false }, | ||
34 | addedColorChips: { value: false }, | 13 | addedColorChips: { value: false }, |
35 | 14 | ||
36 | _fill: { | 15 | _fill: { |
@@ -79,29 +58,17 @@ var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | |||
79 | 58 | ||
80 | _subPrepare: { | 59 | _subPrepare: { |
81 | value: function() { | 60 | value: function() { |
82 | Object.defineBinding(this._fillMaterial, "items", { | 61 | Object.defineBinding(this.fillMaterial, "items", { |
83 | boundObject: this.application.ninja.appModel, | 62 | boundObject: this.application.ninja.appModel, |
84 | boundObjectPropertyPath: "materials", | 63 | boundObjectPropertyPath: "materials", |
85 | oneway: false | 64 | oneway: false |
86 | }); | 65 | }); |
87 | |||
88 | this.handleChange(null); | ||
89 | this._useWebGL.addEventListener("change", this, false); | ||
90 | } | 66 | } |
91 | }, | 67 | }, |
92 | 68 | ||
93 | handleChange: { | 69 | handleAction: { |
94 | value: function(event) { | 70 | value: function(event) { |
95 | if(this._useWebGL.checked) | 71 | (this.useWebGL.checked) ? this._materialsContainer.style["display"] = "" : this._materialsContainer.style["display"] = "none"; |
96 | { | ||
97 | this._use3D = true; | ||
98 | this._materialsContainer.style["display"] = ""; | ||
99 | } | ||
100 | else | ||
101 | { | ||
102 | this._use3D = false; | ||
103 | this._materialsContainer.style["display"] = "none"; | ||
104 | } | ||
105 | } | 72 | } |
106 | } | 73 | } |
107 | }); \ No newline at end of file | 74 | }); \ No newline at end of file |