diff options
author | Ananya Sen | 2012-02-08 15:37:23 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-08 15:37:23 -0800 |
commit | ab6f2f7ada39a9b27408575af9a565daf0a9d291 (patch) | |
tree | 92a796e34530d1a724ddb24ef22e59ffef13c12a /js/components/tools-properties/shape-properties.reel/shape-properties.js | |
parent | 36b2e540f06cef3887e7d0fea60527fee51e2a40 (diff) | |
parent | 5a69d5be181ea98fa842977885ebd8c861dda6ca (diff) | |
download | ninja-ab6f2f7ada39a9b27408575af9a565daf0a9d291.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.js')
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.js | 36 |
1 files changed, 24 insertions, 12 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..79567453 100755 --- 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,12 +45,15 @@ 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._useWebGL.checked) |
40 | this._fillIcon.style["display"] = "none"; | 49 | { |
41 | this._fillMaterial.style["display"] = "none"; | 50 | if(this._selectedSubTool.id === "LineTool") { |
42 | } else { | 51 | this._fillIcon.style["display"] = "none"; |
43 | this._fillIcon.style["display"] = ""; | 52 | this._fillMaterial.visible = false; |
44 | this._fillMaterial.style["display"] = ""; | 53 | } else { |
54 | this._fillIcon.style["display"] = ""; | ||
55 | this._fillMaterial.visible = true; | ||
56 | } | ||
45 | } | 57 | } |
46 | 58 | ||
47 | } | 59 | } |
@@ -55,11 +67,11 @@ exports.ShapeProperties = Montage.create(ToolProperties, { | |||
55 | this._use3D = true; | 67 | this._use3D = true; |
56 | this._materialLabel.style["display"] = ""; | 68 | this._materialLabel.style["display"] = ""; |
57 | this._strokeIcon.style["display"] = ""; | 69 | this._strokeIcon.style["display"] = ""; |
58 | this._strokeMaterial.style["display"] = ""; | 70 | this._strokeMaterial.visible = true; |
59 | if(this.selectedSubTool.id !== "LineTool") | 71 | if(this.selectedSubTool.id !== "LineTool") |
60 | { | 72 | { |
61 | this._fillIcon.style["display"] = ""; | 73 | this._fillIcon.style["display"] = ""; |
62 | this._fillMaterial.style["display"] = ""; | 74 | this._fillMaterial.visible = true; |
63 | } | 75 | } |
64 | } | 76 | } |
65 | else | 77 | else |
@@ -67,9 +79,9 @@ exports.ShapeProperties = Montage.create(ToolProperties, { | |||
67 | this._use3D = false; | 79 | this._use3D = false; |
68 | this._materialLabel.style["display"] = "none"; | 80 | this._materialLabel.style["display"] = "none"; |
69 | this._strokeIcon.style["display"] = "none"; | 81 | this._strokeIcon.style["display"] = "none"; |
70 | this._strokeMaterial.style["display"] = "none"; | 82 | this._strokeMaterial.visible = false; |
71 | this._fillIcon.style["display"] = "none"; | 83 | this._fillIcon.style["display"] = "none"; |
72 | this._fillMaterial.style["display"] = "none"; | 84 | this._fillMaterial.visible = false; |
73 | } | 85 | } |
74 | } | 86 | } |
75 | } | 87 | } |