aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel/shape-properties.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.js')
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.js53
1 files changed, 31 insertions, 22 deletions
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 b0d674cc..345e361c 100644
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -16,8 +16,17 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
16 value: function() { 16 value: function() {
17 this.rectProperties.visible = true; 17 this.rectProperties.visible = true;
18 18
19 ShapesController.DisplayMaterials(this._strokeMaterial); 19 Object.defineBinding(this._strokeMaterial, "items", {
20 ShapesController.DisplayMaterials(this._fillMaterial); 20 boundObject: this.application.ninja.appModel,
21 boundObjectPropertyPath: "materials",
22 oneway: false
23 });
24
25 Object.defineBinding(this._fillMaterial, "items", {
26 boundObject: this.application.ninja.appModel,
27 boundObjectPropertyPath: "materials",
28 oneway: false
29 });
21 30
22 this.handleChange(null); 31 this.handleChange(null);
23 this._useWebGL.addEventListener("change", this, false); 32 this._useWebGL.addEventListener("change", this, false);
@@ -36,13 +45,13 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
36 this._selectedSubTool = value; 45 this._selectedSubTool = value;
37 this[this._selectedSubTool.properties].visible = true; 46 this[this._selectedSubTool.properties].visible = true;
38 47
39 if(this._selectedSubTool.id === "LineTool") { 48// if(this._selectedSubTool.id === "LineTool") {
40 this._fillIcon.style["display"] = "none"; 49// this._fillIcon.style["display"] = "none";
41 this._fillMaterial.style["display"] = "none"; 50// this._fillMaterial.style["display"] = "none";
42 } else { 51// } else {
43 this._fillIcon.style["display"] = ""; 52// this._fillIcon.style["display"] = "";
44 this._fillMaterial.style["display"] = ""; 53// this._fillMaterial.style["display"] = "";
45 } 54// }
46 55
47 } 56 }
48 } 57 }
@@ -53,23 +62,23 @@ exports.ShapeProperties = Montage.create(ToolProperties, {
53 if(this._useWebGL.checked) 62 if(this._useWebGL.checked)
54 { 63 {
55 this._use3D = true; 64 this._use3D = true;
56 this._materialLabel.style["display"] = ""; 65// this._materialLabel.style["display"] = "";
57 this._strokeIcon.style["display"] = ""; 66// this._strokeIcon.style["display"] = "";
58 this._strokeMaterial.style["display"] = ""; 67// this._strokeMaterial.style["display"] = "";
59 if(this.selectedSubTool.id !== "LineTool") 68// if(this.selectedSubTool.id !== "LineTool")
60 { 69// {
61 this._fillIcon.style["display"] = ""; 70// this._fillIcon.style["display"] = "";
62 this._fillMaterial.style["display"] = ""; 71// this._fillMaterial.style["display"] = "";
63 } 72// }
64 } 73 }
65 else 74 else
66 { 75 {
67 this._use3D = false; 76 this._use3D = false;
68 this._materialLabel.style["display"] = "none"; 77// this._materialLabel.style["display"] = "none";
69 this._strokeIcon.style["display"] = "none"; 78// this._strokeIcon.style["display"] = "none";
70 this._strokeMaterial.style["display"] = "none"; 79// this._strokeMaterial.style["display"] = "none";
71 this._fillIcon.style["display"] = "none"; 80// this._fillIcon.style["display"] = "none";
72 this._fillMaterial.style["display"] = "none"; 81// this._fillMaterial.style["display"] = "none";
73 } 82 }
74 } 83 }
75 } 84 }