Skip to content
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

Jump to bottom

call toString on fontWeight else throws error if passed an integer #10483

Closed
wants to merge 8 commits into from
Closed

call toString on fontWeight else throws error if passed an integer #10483

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
30b2a63
call toString on fontWeight else throws error if passed an integer
davidlrnt Oct 20, 2016
92126fa
add ternary in case font weight is not specified
davidlrnt Oct 20, 2016
471ac3d
single quotes
davidlrnt Oct 20, 2016
f7bd05a
Merge branch 'master' into master
davidlrnt Oct 20, 2016
ef8c571
allow fontWeight 0, check for null
davidlrnt Nov 14, 2016
fe42e6e
Merge branch 'master' into master
davidlrnt Nov 28, 2016
a1f7d75
Merge branch 'master' into master
davidlrnt Dec 7, 2016
6c442cb
Merge branch 'master' into master
davidlrnt Apr 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Libraries/ART/ReactNativeART.js
View file
Open in desktop
Expand Up @@ -439,7 +439,7 @@ function extractFont(font) {
}
var fontFamily = extractSingleFontFamily(font.fontFamily);
var fontSize = +font.fontSize || 12;
var fontWeight = font.fontWeight ? font.fontWeight.toString() : "400";
var fontWeight = font.fontWeight ? font.fontWeight.toString() : '400';
return {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quotes: Strings must use singlequote.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If i set fontWeight to 0, it will fallback to 400, so i think it's better using font.fontWeight != null ? font.fontWeight.toString() : '400'

// Normalize
fontFamily: fontFamily,
Expand Down