diff options
Diffstat (limited to 'js/components/tools-properties')
| -rw-r--r-- | js/components/tools-properties/shape-properties.reel/shape-properties.js | 43 | ||||
| -rw-r--r-- | js/components/tools-properties/tag-properties.reel/tag-properties.html | 6 |
2 files changed, 26 insertions, 23 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 345e361c..79567453 100644 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js | |||
| @@ -45,13 +45,16 @@ exports.ShapeProperties = Montage.create(ToolProperties, { | |||
| 45 | this._selectedSubTool = value; | 45 | this._selectedSubTool = value; |
| 46 | this[this._selectedSubTool.properties].visible = true; | 46 | this[this._selectedSubTool.properties].visible = true; |
| 47 | 47 | ||
| 48 | // if(this._selectedSubTool.id === "LineTool") { | 48 | if(this._useWebGL.checked) |
| 49 | // this._fillIcon.style["display"] = "none"; | 49 | { |
| 50 | // this._fillMaterial.style["display"] = "none"; | 50 | if(this._selectedSubTool.id === "LineTool") { |
| 51 | // } else { | 51 | this._fillIcon.style["display"] = "none"; |
| 52 | // this._fillIcon.style["display"] = ""; | 52 | this._fillMaterial.visible = false; |
| 53 | // this._fillMaterial.style["display"] = ""; | 53 | } else { |
| 54 | // } | 54 | this._fillIcon.style["display"] = ""; |
| 55 | this._fillMaterial.visible = true; | ||
| 56 | } | ||
| 57 | } | ||
| 55 | 58 | ||
| 56 | } | 59 | } |
| 57 | } | 60 | } |
| @@ -62,23 +65,23 @@ exports.ShapeProperties = Montage.create(ToolProperties, { | |||
| 62 | if(this._useWebGL.checked) | 65 | if(this._useWebGL.checked) |
| 63 | { | 66 | { |
| 64 | this._use3D = true; | 67 | this._use3D = true; |
| 65 | // this._materialLabel.style["display"] = ""; | 68 | this._materialLabel.style["display"] = ""; |
| 66 | // this._strokeIcon.style["display"] = ""; | 69 | this._strokeIcon.style["display"] = ""; |
| 67 | // this._strokeMaterial.style["display"] = ""; | 70 | this._strokeMaterial.visible = true; |
| 68 | // if(this.selectedSubTool.id !== "LineTool") | 71 | if(this.selectedSubTool.id !== "LineTool") |
| 69 | // { | 72 | { |
| 70 | // this._fillIcon.style["display"] = ""; | 73 | this._fillIcon.style["display"] = ""; |
| 71 | // this._fillMaterial.style["display"] = ""; | 74 | this._fillMaterial.visible = true; |
| 72 | // } | 75 | } |
| 73 | } | 76 | } |
| 74 | else | 77 | else |
| 75 | { | 78 | { |
| 76 | this._use3D = false; | 79 | this._use3D = false; |
| 77 | // this._materialLabel.style["display"] = "none"; | 80 | this._materialLabel.style["display"] = "none"; |
| 78 | // this._strokeIcon.style["display"] = "none"; | 81 | this._strokeIcon.style["display"] = "none"; |
| 79 | // this._strokeMaterial.style["display"] = "none"; | 82 | this._strokeMaterial.visible = false; |
| 80 | // this._fillIcon.style["display"] = "none"; | 83 | this._fillIcon.style["display"] = "none"; |
| 81 | // this._fillMaterial.style["display"] = "none"; | 84 | this._fillMaterial.visible = false; |
| 82 | } | 85 | } |
| 83 | } | 86 | } |
| 84 | } | 87 | } |
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index c7588b9e..2b81bb71 100644 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
| @@ -56,9 +56,9 @@ | |||
| 56 | <label class="label"> Tag Name:</label> | 56 | <label class="label"> Tag Name:</label> |
| 57 | 57 | ||
| 58 | <select id="customTagCB" class="nj-skinned"> | 58 | <select id="customTagCB" class="nj-skinned"> |
| 59 | <option>Article</option> | 59 | <option>article</option> |
| 60 | <option>Aside</option> | 60 | <option>aside</option> |
| 61 | <option>Section</option> | 61 | <option>section</option> |
| 62 | </select> | 62 | </select> |
| 63 | </div> | 63 | </div> |
| 64 | 64 | ||