Skip to content

Color: added support for add color values using uppercase #21687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 21, 2021
Merged

Color: added support for add color values using uppercase #21687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4bfa40
Color: added support for add color values using uppercase
puxiao Apr 21, 2021
dd956c5
Update Color.html
puxiao Apr 21, 2021
217a782
Update Color.html
puxiao Apr 21, 2021
fef5d86
Update Color.html
puxiao Apr 21, 2021
484631a
Update Color.html
puxiao Apr 21, 2021
3923ae5
Update Color.html
puxiao Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/api/en/math/Color.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ <h3>[method:Color setStyle]( [param:String style] ) </h3>
Translucent colors such as "rgba(255, 0, 0, 0.5)" and "hsla(0, 100%, 50%, 0.5)" are also accepted,
but the alpha-channel coordinate will be discarded.<br /><br />

Note that for X11 color names, multiple words such as Dark Orange become the string 'darkorange' (all lowercase).
Note that for X11 color names, multiple words such as Dark Orange become the string 'darkorange'.
</p>

<h3>[method:Color setColorName]( [param:String style] ) </h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/zh/math/Color.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ <h3>[method:Color setStyle]( [param:String style] ) </h3>
半透明颜色例如 "rgba(255, 0, 0, 0.5)" and "hsla(0, 100%, 50%, 0.5)" 也能支持,
但是alpha通道的值将会被丢弃。<br /><br />

注意，对于X11颜色名称，多个单词(如暗橙色)变成字符串“darkorange”(全部是小写字母)。
注意，对于X11颜色名称，多个单词(如暗橙色)变成字符串“darkorange”。
</p>

<h3>[method:Color setColorName]( [param:String style] ) </h3>
Expand Down
2 changes: 1 addition & 1 deletion src/math/Color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class Color {
setColorName( style ) {

// color keywords
const hex = _colorKeywords[ style ];
const hex = _colorKeywords[ style.toLowerCase() ];

if ( hex !== undefined ) {

Expand Down